diff --git a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
index 3a3d15b8406..6a3af4e2ece 100644
--- a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
@@ -37,6 +37,3 @@
   [Revoke blob URL after creating Request, will fetch]
     expected: FAIL
 
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 75ba258e460..6f952a5e080 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -49599,6 +49599,18 @@
      {}
     ]
    ],
+   "css/CSS2/floats/new-fc-separates-from-float-3.html": [
+    [
+     "css/CSS2/floats/new-fc-separates-from-float-3.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats/new-fc-separates-from-float.html": [
     [
      "css/CSS2/floats/new-fc-separates-from-float.html",
@@ -113151,6 +113163,30 @@
      {}
     ]
    ],
+   "css/css-contain/contain-paint-table-001.html": [
+    [
+     "css/css-contain/contain-paint-table-001.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-047-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-table-002.html": [
+    [
+     "css/css-contain/contain-paint-table-002.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-047-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-size-001.html": [
     [
      "css/css-contain/contain-size-001.html",
@@ -113835,6 +113871,18 @@
      {}
     ]
    ],
+   "css/css-contain/contain-subgrid-001.html": [
+    [
+     "css/css-contain/contain-subgrid-001.html",
+     [
+      [
+       "/css/css-contain/reference/contain-subgrid-001.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/counter-scoping-001.html": [
     [
      "css/css-contain/counter-scoping-001.html",
@@ -144285,6 +144333,30 @@
      {}
     ]
    ],
+   "css/css-text/line-breaking/line-breaking-018.html": [
+    [
+     "css/css-text/line-breaking/line-breaking-018.html",
+     [
+      [
+       "/css/css-text/line-breaking/reference/line-breaking-018-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-text/line-breaking/line-breaking-019.html": [
+    [
+     "css/css-text/line-breaking/line-breaking-019.html",
+     [
+      [
+       "/css/css-text/line-breaking/reference/line-breaking-019-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-text/line-breaking/line-breaking-atomic-001.html": [
     [
      "css/css-text/line-breaking/line-breaking-atomic-001.html",
@@ -162261,6 +162333,18 @@
      {}
     ]
    ],
+   "css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html": [
+    [
+     "css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html",
+     [
+      [
+       "/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-transitions/transition-test.html": [
     [
      "css/css-transitions/transition-test.html",
@@ -176407,6 +176491,18 @@
      {}
     ]
    ],
+   "css/filter-effects/backdrop-filter-clipped.html": [
+    [
+     "css/filter-effects/backdrop-filter-clipped.html",
+     [
+      [
+       "/css/filter-effects/backdrop-filter-clipped-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/filter-effects/backdrop-filter-edge-pixels.html": [
     [
      "css/filter-effects/backdrop-filter-edge-pixels.html",
@@ -176491,6 +176587,18 @@
      {}
     ]
    ],
+   "css/filter-effects/backdrop-filter-update.html": [
+    [
+     "css/filter-effects/backdrop-filter-update.html",
+     [
+      [
+       "/css/filter-effects/backdrop-filter-update-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/filter-effects/backdrop-filter-zero-size.html": [
     [
      "css/filter-effects/backdrop-filter-zero-size.html",
@@ -206981,6 +207089,11 @@
      {}
     ]
    ],
+   ".gitattributes": [
+    [
+     {}
+    ]
+   ],
    ".github/main.workflow": [
     [
      {}
@@ -238171,6 +238284,11 @@
      {}
     ]
    ],
+   "cookies/resources/dropSameSiteNone.py": [
+    [
+     {}
+    ]
+   ],
    "cookies/resources/dropSecure.py": [
     [
      {}
@@ -238226,6 +238344,11 @@
      {}
     ]
    ],
+   "cookies/resources/setSameSiteNone.py": [
+    [
+     {}
+    ]
+   ],
    "cookies/resources/setSecure.py": [
     [
      {}
@@ -238236,6 +238359,16 @@
      {}
     ]
    ],
+   "cookies/samesite/resources/echo-cookies.html": [
+    [
+     {}
+    ]
+   ],
+   "cookies/samesite/resources/navigate.html": [
+    [
+     {}
+    ]
+   ],
    "cookies/samesite/resources/puppet.html": [
     [
      {}
@@ -262571,6 +262704,11 @@
      {}
     ]
    ],
+   "css/css-contain/reference/contain-subgrid-001.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-contain/reference/counter-scoping-001-ref.html": [
     [
      {}
@@ -279776,6 +279914,16 @@
      {}
     ]
    ],
+   "css/css-text/line-breaking/reference/line-breaking-018-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-text/line-breaking/reference/line-breaking-019-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-text/line-breaking/reference/line-breaking-atomic-003-ref.html": [
     [
      {}
@@ -282751,6 +282899,11 @@
      {}
     ]
    ],
+   "css/css-transitions/no-transition-from-ua-to-blocking-stylesheet-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-transitions/reference/transition-test-ref.html": [
     [
      {}
@@ -282806,6 +282959,11 @@
      {}
     ]
    ],
+   "css/css-transitions/support/a-green-transition.css": [
+    [
+     {}
+    ]
+   ],
    "css/css-transitions/support/a-green.css": [
     [
      {}
@@ -288171,6 +288329,11 @@
      {}
     ]
    ],
+   "css/filter-effects/backdrop-filter-clipped-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/filter-effects/backdrop-filter-edge-pixels-ref.html": [
     [
      {}
@@ -288196,6 +288359,11 @@
      {}
     ]
    ],
+   "css/filter-effects/backdrop-filter-update-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/filter-effects/backdrop-filter-zero-size-ref.html": [
     [
      {}
@@ -294446,6 +294614,11 @@
      {}
     ]
    ],
+   "dom/events/scrolling/scroll_support.js": [
+    [
+     {}
+    ]
+   ],
    "dom/lists/README.md": [
     [
      {}
@@ -314236,7 +314409,7 @@
      {}
     ]
    ],
-   "referrer-policy/generic/referrer-policy-test-case.js": [
+   "referrer-policy/generic/referrer-policy-test-case.sub.js": [
     [
      {}
     ]
@@ -322276,6 +322449,11 @@
      {}
     ]
    ],
+   "signed-exchange/resources/sxg/sxg-data-cert-url.sxg": [
+    [
+     {}
+    ]
+   ],
    "signed-exchange/resources/sxg/sxg-hsts.sxg": [
     [
      {}
@@ -331181,6 +331359,11 @@
      {}
     ]
    ],
+   "visual-viewport/helper-resize-event-on-load-overflowing-page.html": [
+    [
+     {}
+    ]
+   ],
    "visual-viewport/viewport_support.js": [
     [
      {}
@@ -356707,18 +356890,36 @@
      {}
     ]
    ],
+   "cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.tentative.html": [
+    [
+     "cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.tentative.html",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
    "cookies/samesite/fetch.html": [
     [
      "cookies/samesite/fetch.html",
      {
       "timeout": "long"
      }
+    ],
+    [
+     "cookies/samesite/fetch.html?samesite-by-default-cookies.tentative",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "cookies/samesite/form-get-blank-reload.html": [
     [
      "cookies/samesite/form-get-blank-reload.html",
      {}
+    ],
+    [
+     "cookies/samesite/form-get-blank-reload.html?samesite-by-default-cookies.tentative",
+     {}
     ]
    ],
    "cookies/samesite/form-get-blank.html": [
@@ -356727,12 +356928,22 @@
      {
       "timeout": "long"
      }
+    ],
+    [
+     "cookies/samesite/form-get-blank.html?samesite-by-default-cookies.tentative",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "cookies/samesite/form-post-blank-reload.html": [
     [
      "cookies/samesite/form-post-blank-reload.html",
      {}
+    ],
+    [
+     "cookies/samesite/form-post-blank-reload.html?samesite-by-default-cookies.tentative",
+     {}
     ]
    ],
    "cookies/samesite/form-post-blank.html": [
@@ -356741,6 +356952,12 @@
      {
       "timeout": "long"
      }
+    ],
+    [
+     "cookies/samesite/form-post-blank.html?samesite-by-default-cookies.tentative",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "cookies/samesite/iframe-reload.html": [
@@ -356749,6 +356966,12 @@
      {
       "timeout": "long"
      }
+    ],
+    [
+     "cookies/samesite/iframe-reload.html?samesite-by-default-cookies.tentative",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "cookies/samesite/iframe.html": [
@@ -356757,6 +356980,12 @@
      {
       "timeout": "long"
      }
+    ],
+    [
+     "cookies/samesite/iframe.html?samesite-by-default-cookies.tentative",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "cookies/samesite/img.html": [
@@ -356765,24 +356994,60 @@
      {
       "timeout": "long"
      }
+    ],
+    [
+     "cookies/samesite/img.html?samesite-by-default-cookies.tentative",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "cookies/samesite/setcookie-lax.html": [
     [
      "cookies/samesite/setcookie-lax.html",
      {}
+    ],
+    [
+     "cookies/samesite/setcookie-lax.html?samesite-by-default-cookies.tentative",
+     {}
+    ]
+   ],
+   "cookies/samesite/setcookie-navigation.html": [
+    [
+     "cookies/samesite/setcookie-navigation.html",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "cookies/samesite/setcookie-navigation.html?samesite-by-default-cookies.tentative",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "cookies/samesite/window-open-reload.html": [
     [
      "cookies/samesite/window-open-reload.html",
      {}
+    ],
+    [
+     "cookies/samesite/window-open-reload.html?samesite-by-default-cookies.tentative",
+     {}
     ]
    ],
    "cookies/samesite/window-open.html": [
     [
      "cookies/samesite/window-open.html",
-     {}
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "cookies/samesite/window-open.html?samesite-by-default-cookies.tentative",
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "cookies/secure/set-from-dom.https.sub.html": [
@@ -358624,6 +358889,30 @@
      {}
     ]
    ],
+   "css/css-color-adjust/inheritance.html": [
+    [
+     "css/css-color-adjust/inheritance.html",
+     {}
+    ]
+   ],
+   "css/css-color-adjust/parsing/color-scheme-computed.tentative.html": [
+    [
+     "css/css-color-adjust/parsing/color-scheme-computed.tentative.html",
+     {}
+    ]
+   ],
+   "css/css-color-adjust/parsing/color-scheme-invalid.html": [
+    [
+     "css/css-color-adjust/parsing/color-scheme-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-color-adjust/parsing/color-scheme-valid.html": [
+    [
+     "css/css-color-adjust/parsing/color-scheme-valid.html",
+     {}
+    ]
+   ],
    "css/css-color/color-function-parsing.html": [
     [
      "css/css-color/color-function-parsing.html",
@@ -363628,12 +363917,42 @@
      {}
     ]
    ],
+   "css/css-scroll-snap/parsing/scroll-padding-block-computed.html": [
+    [
+     "css/css-scroll-snap/parsing/scroll-padding-block-computed.html",
+     {}
+    ]
+   ],
+   "css/css-scroll-snap/parsing/scroll-padding-block-invalid.html": [
+    [
+     "css/css-scroll-snap/parsing/scroll-padding-block-invalid.html",
+     {}
+    ]
+   ],
    "css/css-scroll-snap/parsing/scroll-padding-block-valid.html": [
     [
      "css/css-scroll-snap/parsing/scroll-padding-block-valid.html",
      {}
     ]
    ],
+   "css/css-scroll-snap/parsing/scroll-padding-computed.html": [
+    [
+     "css/css-scroll-snap/parsing/scroll-padding-computed.html",
+     {}
+    ]
+   ],
+   "css/css-scroll-snap/parsing/scroll-padding-inline-computed.html": [
+    [
+     "css/css-scroll-snap/parsing/scroll-padding-inline-computed.html",
+     {}
+    ]
+   ],
+   "css/css-scroll-snap/parsing/scroll-padding-inline-invalid.html": [
+    [
+     "css/css-scroll-snap/parsing/scroll-padding-inline-invalid.html",
+     {}
+    ]
+   ],
    "css/css-scroll-snap/parsing/scroll-padding-inline-valid.html": [
     [
      "css/css-scroll-snap/parsing/scroll-padding-inline-valid.html",
@@ -373763,6 +374082,78 @@
      {}
     ]
    ],
+   "dom/events/scrolling/overscroll-event-fired-to-document.html": [
+    [
+     "dom/events/scrolling/overscroll-event-fired-to-document.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html": [
+    [
+     "dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html": [
+    [
+     "dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "dom/events/scrolling/overscroll-event-fired-to-window.html": [
+    [
+     "dom/events/scrolling/overscroll-event-fired-to-window.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "dom/events/scrolling/scrollend-event-fired-after-snap.html": [
+    [
+     "dom/events/scrolling/scrollend-event-fired-after-snap.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "dom/events/scrolling/scrollend-event-fired-to-document.html": [
+    [
+     "dom/events/scrolling/scrollend-event-fired-to-document.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html": [
+    [
+     "dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "dom/events/scrolling/scrollend-event-fired-to-scrolled-element.html": [
+    [
+     "dom/events/scrolling/scrollend-event-fired-to-scrolled-element.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "dom/events/scrolling/scrollend-event-fired-to-window.html": [
+    [
+     "dom/events/scrolling/scrollend-event-fired-to-window.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "dom/events/shadow-relatedTarget.html": [
     [
      "dom/events/shadow-relatedTarget.html",
@@ -401654,18 +402045,6 @@
      {}
     ]
    ],
-   "html/semantics/text-level-semantics/the-a-element/a.rel-getter-01.html": [
-    [
-     "html/semantics/text-level-semantics/the-a-element/a.rel-getter-01.html",
-     {}
-    ]
-   ],
-   "html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html": [
-    [
-     "html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html",
-     {}
-    ]
-   ],
    "html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html": [
     [
      "html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html",
@@ -401678,12 +402057,6 @@
      {}
     ]
    ],
-   "html/semantics/text-level-semantics/the-data-element/data.value-001.html": [
-    [
-     "html/semantics/text-level-semantics/the-data-element/data.value-001.html",
-     {}
-    ]
-   ],
    "html/semantics/text-level-semantics/the-time-element/001.html": [
     [
      "html/semantics/text-level-semantics/the-time-element/001.html",
@@ -410371,6 +410744,19 @@
      }
     ]
    ],
+   "native-file-system/NativeFileSystemWritableFileStream.tentative.window.js": [
+    [
+     "native-file-system/NativeFileSystemWritableFileStream.tentative.window.html",
+     {
+      "script_metadata": [
+       [
+        "script",
+        "resources/test-helpers.js"
+       ]
+      ]
+     }
+    ]
+   ],
    "navigation-timing/dom_interactive_image_document.html": [
     [
      "navigation-timing/dom_interactive_image_document.html",
@@ -436465,6 +436851,12 @@
      {}
     ]
    ],
+   "signed-exchange/sxg-data-cert-url.tentative.html": [
+    [
+     "signed-exchange/sxg-data-cert-url.tentative.html",
+     {}
+    ]
+   ],
    "signed-exchange/sxg-double-prefetch.tentative.html": [
     [
      "signed-exchange/sxg-double-prefetch.tentative.html",
@@ -444492,6 +444884,12 @@
      {}
     ]
    ],
+   "user-timing/performance-measure-invalid.worker.js": [
+    [
+     "user-timing/performance-measure-invalid.worker.html",
+     {}
+    ]
+   ],
    "user-timing/supported-usertiming-types.any.js": [
     [
      "user-timing/supported-usertiming-types.any.html",
@@ -451163,6 +451561,12 @@
      {}
     ]
    ],
+   "webrtc/RTCSctpTransport-maxChannels.html": [
+    [
+     "webrtc/RTCSctpTransport-maxChannels.html",
+     {}
+    ]
+   ],
    "webrtc/RTCSctpTransport-maxMessageSize.html": [
     [
      "webrtc/RTCSctpTransport-maxMessageSize.html",
@@ -451258,6 +451662,12 @@
      {}
     ]
    ],
+   "webrtc/protocol/candidate-exchange.https.html": [
+    [
+     "webrtc/protocol/candidate-exchange.https.html",
+     {}
+    ]
+   ],
    "webrtc/protocol/ice-state.https.html": [
     [
      "webrtc/protocol/ice-state.https.html",
@@ -455967,12 +456377,6 @@
      {}
     ]
    ],
-   "webxr/xrSession_identity_referenceSpace.https.html": [
-    [
-     "webxr/xrSession_identity_referenceSpace.https.html",
-     {}
-    ]
-   ],
    "webxr/xrSession_prevent_multiple_exclusive.https.html": [
     [
      "webxr/xrSession_prevent_multiple_exclusive.https.html",
@@ -456009,6 +456413,12 @@
      {}
     ]
    ],
+   "webxr/xrSession_viewer_referenceSpace.https.html": [
+    [
+     "webxr/xrSession_viewer_referenceSpace.https.html",
+     {}
+    ]
+   ],
    "webxr/xrView_eyes.https.html": [
     [
      "webxr/xrView_eyes.https.html",
@@ -481514,13 +481924,17 @@
  },
  "paths": {
   ".azure-pipelines.yml": [
-   "aff69297b39caef1c35fd77aac4ef941da5bdbb0",
+   "99873aece5caff1c997c55e5c56db518730a0c1b",
    "support"
   ],
   ".codecov.yml": [
    "904cf85a4fd7576bb470172ade7317de94435dd0",
    "support"
   ],
+  ".gitattributes": [
+   "5c11e4e33a723cc9023fbc314c966294236c3ca4",
+   "support"
+  ],
   ".github/main.workflow": [
    "4f4447fdf0ff12f0910d20f16e6e31c9dd696749",
    "support"
@@ -512170,7 +512584,7 @@
    "support"
   ],
   "content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html": [
-   "f4daf182f74fd550bee7d2d274e3842c84054e7c",
+   "e95e71c59bca3b368034d3b44fda8834d0eeb7b1",
    "testharness"
   ],
   "content-security-policy/navigation/to-javascript-parent-initiated-parent-csp-disallow.html": [
@@ -515882,7 +516296,7 @@
    "testharness"
   ],
   "cookies/prefix/__secure.header.https.html": [
-   "8753a320b4e5925bc2acb88861ee24c4cebe79af",
+   "70d29873cf233e9acac3946163f24a8f8b40a96b",
    "testharness"
   ],
   "cookies/prefix/document-cookie.non-secure.html": [
@@ -515890,7 +516304,7 @@
    "testharness"
   ],
   "cookies/resources/cookie-helper.sub.js": [
-   "1cd924a0c93203d211cffb3133083867b754cce6",
+   "f0ca5d6d245489f1bd01d9e917e922685dc0c51e",
    "support"
   ],
   "cookies/resources/drop.py": [
@@ -515898,7 +516312,11 @@
    "support"
   ],
   "cookies/resources/dropSameSite.py": [
-   "803dbeb82cdaffa415b47dbc5560617d3c71f0bc",
+   "4a3f890cb91b84dcd760730599ffa690e65427c4",
+   "support"
+  ],
+  "cookies/resources/dropSameSiteNone.py": [
+   "92d6105afb5e0456e80c46be33e6b9ca8cffa9b4",
    "support"
   ],
   "cookies/resources/dropSecure.py": [
@@ -515942,7 +516360,11 @@
    "support"
   ],
   "cookies/resources/setSameSite.py": [
-   "8ae177607e07d9e72c902dc1e0579c3c313805ab",
+   "fdf7e7193b4847a7f9af264bccf66fc1e2d28a04",
+   "support"
+  ],
+  "cookies/resources/setSameSiteNone.py": [
+   "e96cbc22e087a621741b39380d2941d053dfd5c7",
    "support"
   ],
   "cookies/resources/setSecure.py": [
@@ -515953,52 +516375,68 @@
    "84368d6d99080b3279f015659c00b25d9adaf656",
    "support"
   ],
+  "cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.tentative.html": [
+   "18cf0516e64ec2c416b013b232d4247b5647b22c",
+   "testharness"
+  ],
   "cookies/samesite/fetch.html": [
-   "3a2d5bf64c5c685005a6a8d86e40e5ef2e95a5a1",
+   "6f1d92a6f548b51a38c804a7d3d0da8e8f0c7132",
    "testharness"
   ],
   "cookies/samesite/form-get-blank-reload.html": [
-   "09f3ee91a21c3442f3091d644e27d9d578677e95",
+   "5fa8ab975debf22b75abc8220685907690653159",
    "testharness"
   ],
   "cookies/samesite/form-get-blank.html": [
-   "b7351702b800be327348a833454cd503c57aea37",
+   "47fc9fa34f72544e131a376e7b0a1a6cc02c060d",
    "testharness"
   ],
   "cookies/samesite/form-post-blank-reload.html": [
-   "f9449bf46c92f86584b07caa48ef67778624604c",
+   "5098dfb4b03f5407faa36a95f4ffe9a5c351a264",
    "testharness"
   ],
   "cookies/samesite/form-post-blank.html": [
-   "f2bb0cacfbcb1d86c83967f22849ba7d677721c8",
+   "75d6024c75cda60a0d8f7cd28e39e9e3cc3a86fa",
    "testharness"
   ],
   "cookies/samesite/iframe-reload.html": [
-   "c4c3598ca44602a455f2ff6b8b29e5a421913c5e",
+   "11d34bb9fcc179f6a745666d4f9d8677168bcdbf",
    "testharness"
   ],
   "cookies/samesite/iframe.html": [
-   "e511128f9633c145cd2c2c5c94d716132d460209",
+   "4cce83081e6b571d5ecfeb03220baff0b9da4327",
    "testharness"
   ],
   "cookies/samesite/img.html": [
-   "bca84cbd28b8d19edd221496ad83329813e0db30",
+   "071c24fb30ef2666651bb9f00f2504db8a709090",
    "testharness"
   ],
+  "cookies/samesite/resources/echo-cookies.html": [
+   "9b8b286015f2adff3721faeeeeba13c6a645357c",
+   "support"
+  ],
+  "cookies/samesite/resources/navigate.html": [
+   "ef40642a5d467ff66c64792e16191e499c7d5c8c",
+   "support"
+  ],
   "cookies/samesite/resources/puppet.html": [
    "9f4f8e2242c71f8e79ed3424dcbca0c76426b095",
    "support"
   ],
   "cookies/samesite/setcookie-lax.html": [
-   "2826f676a5b18bae6ef88b90238de2e74692b0a8",
+   "04b2ce264c846b5952c038d9db744c2a341563fa",
+   "testharness"
+  ],
+  "cookies/samesite/setcookie-navigation.html": [
+   "3663aa28a209f2ff4221b5d89e055a6e09bfe1bf",
    "testharness"
   ],
   "cookies/samesite/window-open-reload.html": [
-   "fd9c7a6d5a8c2ca8ac184dadf72b8d397e8af8cb",
+   "d8bc112344cff5198b39c1e57986ba746f4e4d64",
    "testharness"
   ],
   "cookies/samesite/window-open.html": [
-   "1aa8e5e80bbf4319bb3903b228416a994723b4db",
+   "b7dc8361ec2f4d5b54ec1ba9a9e228a8e721c108",
    "testharness"
   ],
   "cookies/secure/set-from-dom.https.sub.html": [
@@ -535761,6 +536199,10 @@
    "fd0deab18e0ee8baf17764804825767b6c516c2c",
    "reftest"
   ],
+  "css/CSS2/floats/new-fc-separates-from-float-3.html": [
+   "4c37be4ba2f4a96ae764c86cf8152517c38f204c",
+   "reftest"
+  ],
   "css/CSS2/floats/new-fc-separates-from-float.html": [
    "89ee7516ecf22f895de3b8e88047d5b767fea96a",
    "reftest"
@@ -580881,6 +581323,22 @@
    "e68417ff041e5a651e9b005938c8d5d804a81d66",
    "reftest"
   ],
+  "css/css-color-adjust/inheritance.html": [
+   "c48d2ade7bb0339377480cf506dad7312303deb1",
+   "testharness"
+  ],
+  "css/css-color-adjust/parsing/color-scheme-computed.tentative.html": [
+   "74d1bb919dc299c20fa8d1a11fe116e28fa59bfd",
+   "testharness"
+  ],
+  "css/css-color-adjust/parsing/color-scheme-invalid.html": [
+   "0def5b3fc1090ab288c8ab9d601824e54e620f08",
+   "testharness"
+  ],
+  "css/css-color-adjust/parsing/color-scheme-valid.html": [
+   "433610061f29411dcc9b7379ce4123fbb5110766",
+   "testharness"
+  ],
   "css/css-color/LICENSE": [
    "d47f50cca8a2d9dc40dee384ae256f8aecf44e0a",
    "support"
@@ -582281,6 +582739,14 @@
    "51459a53feb6b626b7e9dc07061024eca722209b",
    "reftest"
   ],
+  "css/css-contain/contain-paint-table-001.html": [
+   "70caa578e88eeea3fcb5a481d0aeb47c75256b5c",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-table-002.html": [
+   "a6ce97ec15b72c86d992001f48b647427abc6d2e",
+   "reftest"
+  ],
   "css/css-contain/contain-size-001.html": [
    "49dfc41601eb32f80c76a427403beb2f98d3f404",
    "reftest"
@@ -582525,6 +582991,10 @@
    "feef9209f5c19f51233a2025108b66c63b58f34c",
    "support"
   ],
+  "css/css-contain/contain-subgrid-001.html": [
+   "59a104bfbad86c146ae3d9653478e11b645af7cd",
+   "reftest"
+  ],
   "css/css-contain/counter-scoping-001.html": [
    "f7d40dc5a0850919f1b86ca31e9ebd44ec96b72d",
    "reftest"
@@ -582773,6 +583243,10 @@
    "12f9b989fd2402d5e8af279cd03f03931856270e",
    "support"
   ],
+  "css/css-contain/reference/contain-subgrid-001.html": [
+   "ab0d1fede5367681b74a6790286796249614a5f1",
+   "support"
+  ],
   "css/css-contain/reference/counter-scoping-001-ref.html": [
    "2ebbb9a93c31d0c53b396f9a118951b85c16650c",
    "support"
@@ -607865,16 +608339,36 @@
    "be3499869159c5fb29f9859889f4f2354874853c",
    "testharness"
   ],
+  "css/css-scroll-snap/parsing/scroll-padding-block-computed.html": [
+   "68ad0cd8362b62efcdf39665548fc0de7c1fd2ec",
+   "testharness"
+  ],
+  "css/css-scroll-snap/parsing/scroll-padding-block-invalid.html": [
+   "206e6f5da89a7cc1ae411b57652d7bf1e266844a",
+   "testharness"
+  ],
   "css/css-scroll-snap/parsing/scroll-padding-block-valid.html": [
    "79f675acd5b530db6f0fc6d31a5f059651c8b1f6",
    "testharness"
   ],
+  "css/css-scroll-snap/parsing/scroll-padding-computed.html": [
+   "5a5123a6dac25b667a6da9467abf0188a600f84a",
+   "testharness"
+  ],
+  "css/css-scroll-snap/parsing/scroll-padding-inline-computed.html": [
+   "d753bacbca02e6615bb4f60fbc2dc16f631f043c",
+   "testharness"
+  ],
+  "css/css-scroll-snap/parsing/scroll-padding-inline-invalid.html": [
+   "0cf3fa7353f7123d0f27573c610ce42638c59d40",
+   "testharness"
+  ],
   "css/css-scroll-snap/parsing/scroll-padding-inline-valid.html": [
    "3fb9003585a9d9cb4af7891cd77ca91f3b8f42c0",
    "testharness"
   ],
   "css/css-scroll-snap/parsing/scroll-padding-invalid.html": [
-   "9b24a539f7a9810c0bc8f92440da5c075a3d63d5",
+   "e060fcdc0ec064a255ff496fd329fab9917b73b4",
    "testharness"
   ],
   "css/css-scroll-snap/parsing/scroll-padding-valid.html": [
@@ -614073,6 +614567,14 @@
    "36af931b1dc95ecd0d91b5d9637257370e246a72",
    "reftest"
   ],
+  "css/css-text/line-breaking/line-breaking-018.html": [
+   "ade2b6d4d6616ef9fa51992a2a1679c2f65f1dfd",
+   "reftest"
+  ],
+  "css/css-text/line-breaking/line-breaking-019.html": [
+   "e755eff38133b6db65e9902a94047b120cf81dd1",
+   "reftest"
+  ],
   "css/css-text/line-breaking/line-breaking-atomic-001.html": [
    "03666417ca40e9f6efeb6c2e6be6a78ff0f477fa",
    "reftest"
@@ -614161,6 +614663,14 @@
    "6f94b129d294bfc2527c5d2aa800fb6ebadb526e",
    "support"
   ],
+  "css/css-text/line-breaking/reference/line-breaking-018-ref.html": [
+   "e40669b742937e856773caec58f889977ab912bf",
+   "support"
+  ],
+  "css/css-text/line-breaking/reference/line-breaking-019-ref.html": [
+   "4a7772aa290f5ba72b3f9c604e9935438269e6f9",
+   "support"
+  ],
   "css/css-text/line-breaking/reference/line-breaking-atomic-003-ref.html": [
    "93a6d491c2336467ee8dc48ea37c10203ab05863",
    "support"
@@ -615946,11 +616456,11 @@
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-capitalize-033-ref.html": [
-   "5af9912b28f0fb976bb93a4405800ccc2d36b959",
+   "7bbacef735c08e8f214f341d77179edc1b90d315",
    "support"
   ],
   "css/css-text/text-transform/text-transform-capitalize-033.html": [
-   "8bc66177f658c30e04f5b3da4f16537e28530996",
+   "7a764cdf68032a15f5a4605531bc0e8365272936",
    "reftest"
   ],
   "css/css-text/text-transform/text-transform-copy-paste-001-manual.html": [
@@ -623093,6 +623603,14 @@
    "986436950e419a1670c75a45ab5eb39b7db6edca",
    "testharness"
   ],
+  "css/css-transitions/no-transition-from-ua-to-blocking-stylesheet-ref.html": [
+   "93b4ae982e80d31df4cb0eac448ceb3341c57a81",
+   "support"
+  ],
+  "css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html": [
+   "4967eabda86bf42be467b826f8782e91a115748e",
+   "reftest"
+  ],
   "css/css-transitions/non-rendered-element-001.html": [
    "10419b94677bbfeedf84c5c348d2285338f6ea11",
    "testharness"
@@ -623233,6 +623751,10 @@
    "2e5f2ad0738c58dfdf7b368d1fff7aca4f797156",
    "support"
   ],
+  "css/css-transitions/support/a-green-transition.css": [
+   "3f68e53cd6c043fd4d87f2898fb78b54894c9a49",
+   "support"
+  ],
   "css/css-transitions/support/a-green.css": [
    "b0dbb071d5b05d1c574cd5c9a660f1e3d62c573b",
    "support"
@@ -636893,6 +637415,14 @@
    "4fc4b739ddb5a316ca6ca4706940c04df96e57d3",
    "reftest"
   ],
+  "css/filter-effects/backdrop-filter-clipped-ref.html": [
+   "60b0b6c117332f0e246816f71b378fc6eabe58c2",
+   "support"
+  ],
+  "css/filter-effects/backdrop-filter-clipped.html": [
+   "bc25b25944f47d6f053580939752803f0b929c99",
+   "reftest"
+  ],
   "css/filter-effects/backdrop-filter-edge-pixels-ref.html": [
    "bbd562856f7a0ee305874575935c66e8b4830c1d",
    "support"
@@ -636941,6 +637471,14 @@
    "6c61a9620aa82d23375fd31900d87bcfd873a5e1",
    "reftest"
   ],
+  "css/filter-effects/backdrop-filter-update-ref.html": [
+   "ec4d80628b83c1e8e42cb389701dd7809b85ce6d",
+   "support"
+  ],
+  "css/filter-effects/backdrop-filter-update.html": [
+   "de629a1fb2f85b1be4e2c4dd8bf53200b5295dc0",
+   "reftest"
+  ],
   "css/filter-effects/backdrop-filter-zero-size-ref.html": [
    "05383cd3bb4517a35f18927eb3353151b7bbf6c8",
    "support"
@@ -650709,6 +651247,46 @@
    "241dda8b66f8c8fe128e736bcb073479aee634a9",
    "support"
   ],
+  "dom/events/scrolling/overscroll-event-fired-to-document.html": [
+   "c054ffca9c471f78ce5d1cbaa210fa7aad3aee3b",
+   "testharness"
+  ],
+  "dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html": [
+   "750080e6568e863a9249bc62e52971d9459f8418",
+   "testharness"
+  ],
+  "dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html": [
+   "cfc782a809a7e73a9d0a84d938caac6a704d784d",
+   "testharness"
+  ],
+  "dom/events/scrolling/overscroll-event-fired-to-window.html": [
+   "ef5ae3daef8158c9424cf07ad091c6a945456d0a",
+   "testharness"
+  ],
+  "dom/events/scrolling/scroll_support.js": [
+   "6fd1b32294bb8933b5e9918ea8260b873b987f8a",
+   "support"
+  ],
+  "dom/events/scrolling/scrollend-event-fired-after-snap.html": [
+   "ef1b495791cad1079063180619861bfbb0d5e682",
+   "testharness"
+  ],
+  "dom/events/scrolling/scrollend-event-fired-to-document.html": [
+   "a35508e2c557a9280802ab3d0d937fce03628e44",
+   "testharness"
+  ],
+  "dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html": [
+   "0269c66fdde1922ca9d997a3189831136ba59b13",
+   "testharness"
+  ],
+  "dom/events/scrolling/scrollend-event-fired-to-scrolled-element.html": [
+   "87cad79df7c2af1835db2fc7fe92198ceeef83ea",
+   "testharness"
+  ],
+  "dom/events/scrolling/scrollend-event-fired-to-window.html": [
+   "f9510e6e23161515d4856e298b223b08c44a33b3",
+   "testharness"
+  ],
   "dom/events/shadow-relatedTarget.html": [
    "713555b7d8ab6117d12c70d08185335246e44e1a",
    "testharness"
@@ -652842,7 +653420,7 @@
    "testharness"
   ],
   "element-timing/observe-shadow-image.html": [
-   "4309196cddcdca22076b095e1e1688571ec1c23b",
+   "12bda4724bd8bf7cbc7b62b70e60efdd1c212f0f",
    "testharness"
   ],
   "element-timing/observe-svg-image.html": [
@@ -657270,7 +657848,7 @@
    "testharness"
   ],
   "fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html": [
-   "8d6c452fd6a2e6b349c1d8faa9d44c613492d87d",
+   "62fd9ca389da9fda5e7c6655ae88be57b7688d5b",
    "testharness"
   ],
   "fetch/corb/style-css-mislabeled-as-html-nosniff.sub.html": [
@@ -676113,14 +676691,6 @@
    "fb0780dee81bc1edc52dd223feefdbdaf53f2363",
    "testharness"
   ],
-  "html/semantics/text-level-semantics/the-a-element/a.rel-getter-01.html": [
-   "8e47121eb8ca2cef21e455ccfa7e1be07ed34324",
-   "testharness"
-  ],
-  "html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html": [
-   "c319266887b7ee916e80bce1eadcc033a13411bd",
-   "testharness"
-  ],
   "html/semantics/text-level-semantics/the-a-element/a.text-getter-01.html": [
    "e0bb73be0ff0ca65efc6542e24c3c4f161d222fe",
    "testharness"
@@ -676309,10 +676879,6 @@
    "1dfa6836f398cc0d7e15a694655a68771d51c804",
    "reftest"
   ],
-  "html/semantics/text-level-semantics/the-data-element/data.value-001.html": [
-   "9fc827b9b886163290b813176ba4159fcfdea27c",
-   "testharness"
-  ],
   "html/semantics/text-level-semantics/the-ruby-element/ruby-usage-notref.html": [
    "f5747811ae40ec6114976d05955e4a85a7c4cf44",
    "support"
@@ -684825,6 +685391,10 @@
    "bc5cfd104b6a2645a5321e0f9d38e990b6533969",
    "testharness"
   ],
+  "native-file-system/NativeFileSystemWritableFileStream.tentative.window.js": [
+   "1dbcb2b136220954c777b2cc3b0197039cf730be",
+   "testharness"
+  ],
   "native-file-system/README.md": [
    "6905a68e7901ce26bc1a363062304e1536604400",
    "support"
@@ -694014,7 +694584,7 @@
    "support"
   ],
   "referrer-policy/README.md": [
-   "ea158fe539468ddf5fd0840b87a4b57b79fb68f2",
+   "303362df924c81e3c7d2389255af8f625e6898da",
    "support"
   ],
   "referrer-policy/css-integration/README.md": [
@@ -694022,15 +694592,15 @@
    "support"
   ],
   "referrer-policy/css-integration/child-css/external-import-stylesheet.html": [
-   "3ced0f4998335d34385f9f843ed9d96414d375e5",
+   "0d26645aa709f9ca1bacbf4d5521ec3c03c86e9c",
    "testharness"
   ],
   "referrer-policy/css-integration/child-css/internal-import-stylesheet.html": [
-   "df835c45e106ebf57dd0671d70d4d09d32f3cdc9",
+   "5e0ac6b270a57d3cc9009b2a9f3f92e8e0bc6dfe",
    "testharness"
   ],
   "referrer-policy/css-integration/child-css/processing-instruction.html": [
-   "1a0d9ebdda2c6d852dd570e4548c69b807f49c21",
+   "88474aae7383da9658bf7b6dae0fb61dccf0a08e",
    "testharness"
   ],
   "referrer-policy/css-integration/css-test-helper.js": [
@@ -694038,75 +694608,75 @@
    "support"
   ],
   "referrer-policy/css-integration/font-face/external-import-stylesheet.html": [
-   "db655fbb7260a2971d27780f1bbdca1d962fdd72",
+   "164f8a5d1e825bce9cd8fdb4b23454d3de77a957",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/external-stylesheet.html": [
-   "cc99b1f3ddcadc9ffc804b09851abc5ba7fc58a2",
+   "c7908939ccb0c9e85d544fb14ca29c4692f0a361",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/internal-import-stylesheet.html": [
-   "969db95179ef8976a6f44918efd486c591666df1",
+   "74a3cbde0aee03204bb6f7498535dcec320149ec",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/internal-stylesheet.html": [
-   "40eb09357b98b92e8773211c0fc312f194a91c10",
+   "078536ee3864b236a50f7f7cf11dfa9554751ec2",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/processing-instruction.html": [
-   "25b0ed13473654418ceea7c21fce6bb2d54bb7ef",
+   "bae74857f3faec7db601acbf79db50b66bd3c8a2",
    "testharness"
   ],
   "referrer-policy/css-integration/image/external-import-stylesheet.html": [
-   "370bc44b6c197dd29c7ece8c5eeeeedc452afa9e",
+   "5f5069b71582bde3827754cb47d35e098f9d56d9",
    "testharness"
   ],
   "referrer-policy/css-integration/image/external-stylesheet.html": [
-   "eb1b019c988e549699e8745f56c85a3a483016c3",
+   "a3b061d79ef36fe7dfe26dcf75317117a246c740",
    "testharness"
   ],
   "referrer-policy/css-integration/image/inline-style.html": [
-   "d6ff26e7bcc0c9d426b24a1b65c79768bb81aa4e",
+   "a0e9daabbc66679796cddbb4e24ed248086741f4",
    "testharness"
   ],
   "referrer-policy/css-integration/image/internal-import-stylesheet.html": [
-   "e96b25a9712f6ec610c2927006d07ab68b520dcb",
+   "80f7ec41b5990d46a99361abcbf6b6fa42fea741",
    "testharness"
   ],
   "referrer-policy/css-integration/image/internal-stylesheet.html": [
-   "29a8517e117b092b648b2603de67eca52e7dfd4d",
+   "f0b46995f60b8ec1a95ce4e209ec522ee69f41a4",
    "testharness"
   ],
   "referrer-policy/css-integration/image/presentation-attribute.html": [
-   "95d3b11a42aae6b314f414352b73c5f35d1bff53",
+   "6f2dc3aa4e6671085fe95092f26f1b25275f7019",
    "testharness"
   ],
   "referrer-policy/css-integration/image/processing-instruction.html": [
-   "e52d9b65097f37a0dfd73b9b9b851d7d0df8b3a9",
+   "97f23405c26f7cab15fc35fb423df11398456309",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/external-stylesheet.html": [
-   "54ee36ce30bdf767f4d42855621d9c603fff7b43",
+   "c02e5598f74942f9739620902a5434e6b0f3d3fd",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/inline-style.html": [
-   "59fb4025f3ba1ad96eb734805a162c4a39f08faf",
+   "5e8552ce8c76b42ebfd39193f67db1a4370c1b18",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/internal-stylesheet.html": [
-   "82d75665ea1cc14efb3d9df64f8c115b5f6a1792",
+   "c061f3ab13d57b51a5ce85d1e625f759aa4eb668",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/presentation-attribute.html": [
-   "8e616416380e3527535c0bf12e6aca630efdefbf",
+   "859e405e2233270f24247131c99210a334d02171",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/processing-instruction.html": [
-   "99ec1ae6aeb8737e996bc355f6e42cc5705b1a0f",
+   "93b6037ca632a678f8c3f1e071392e8e3bf1540c",
    "testharness"
   ],
   "referrer-policy/generic/iframe-inheritance.html": [
-   "ca17e03933a933f19fe4b69328f1b7df3740d3a2",
+   "28e83df6c2ab9b27417b15948929d044095fdceb",
    "testharness"
   ],
   "referrer-policy/generic/link-rel-prefetch.html": [
@@ -694114,7 +694684,7 @@
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-and-values.html": [
-   "b7a9c9fe0e4e69f12f804e3366f9cd817bc0d3da",
+   "d4826ce8a7ae2b40898a598c36523d9520c54b4c",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-and-values.html.headers": [
@@ -694122,7 +694692,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-combined.html": [
-   "c13403aa22acc32527c4348c48a377f388ad453c",
+   "47b59f556614119ee1dfba56e6673a652a725868",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-combined.html.headers": [
@@ -694130,7 +694700,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-one-invalid.html": [
-   "c36c456e23a26dcaae0bea2e89ad11a81e82aa54",
+   "9bd661fe6a247809f1e8b7ee5ccfdcadad0f4edd",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-one-invalid.html.headers": [
@@ -694138,7 +694708,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-one-unknown-token.html": [
-   "6a8c8eecbff039f4ede7837e0e0386192bbc8621",
+   "7c28a5ada5273d94ac07ca2ec182c06047b9a560",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-one-unknown-token.html.headers": [
@@ -694146,19 +694716,19 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers.html": [
-   "5b9c4eb20a4624a5078e539aa8e5bbd0e9534145",
+   "7f0364f1853f65cb1020af53bbeefcd6f44b0011",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers.html.headers": [
    "dd1dd853f2030bac5c036f693a7cf0eca6daba1a",
    "support"
   ],
-  "referrer-policy/generic/referrer-policy-test-case.js": [
-   "c8a3beaf89eb50ad0ef1ab3efc3593b8d9a3b9b1",
+  "referrer-policy/generic/referrer-policy-test-case.sub.js": [
+   "b2867609e7ecb09d2ffc84494b8cdb6650f14a76",
    "support"
   ],
   "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html": [
-   "da3455cb2a88e97b96b9da84c2ed4aa0d619ac3b",
+   "0e8e5e1306f5f51c17d8a89c92bb86573c3e275e",
    "testharness"
   ],
   "referrer-policy/generic/sanity-checker.js": [
@@ -694166,7 +694736,7 @@
    "support"
   ],
   "referrer-policy/generic/subresource-test/area-navigate.html": [
-   "936e2ef0f50cf0ee5d9a47094ce6fdf86fa5e387",
+   "ad49c0c2efd7ef18070a73caafd9223e1ec3b39d",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html": [
@@ -694174,31 +694744,31 @@
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/fetch-messaging.html": [
-   "cc17b3d8de9846482a9af083ac4c5585bdb38287",
+   "2d835274c132591a8edc574ad747e7d103de0659",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/iframe-messaging.html": [
-   "45c5abc86441bd723acc4093bbd1500de129246b",
+   "2f97ce4c62a8dc96c886e17b9113ee9b7c021174",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/image-decoding.html": [
-   "a3c8626641c6e469487c87174b6656ebd50fd6f5",
+   "97abb153f1fca19eb53c280117120299374b1b6c",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/link-navigate.html": [
-   "966547c3580a01933321f78e1a2ae05348412237",
+   "e96fd22539829ef2f71053517941eb3a8178d167",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/script-messaging.html": [
-   "0a93266e2c58021102abaebd335317c40a3dfbdc",
+   "44c938fa6e1c34b3761ac6a797d2e87a319fc08b",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/worker-messaging.html": [
-   "c85cfca5c39fed22d708bd002ee668d4a1de8742",
+   "0612e9965983c4ee696e63be71dcdc31981aa31a",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/xhr-messaging.html": [
-   "dd48dec8e6ba24932fbb930006143124e3c7790f",
+   "8afbf1db237130d6c8258b755ceac5258f6500fa",
    "testharness"
   ],
   "referrer-policy/generic/tools/__init__.py": [
@@ -694210,7 +694780,7 @@
    "support"
   ],
   "referrer-policy/generic/tools/generate.py": [
-   "a59770ffa26cbb933c7185b75d58bd00b75103c7",
+   "b3e3340d97b346c3f2aa787dd55635dffa63f929",
    "support"
   ],
   "referrer-policy/generic/tools/regenerate": [
@@ -694222,171 +694792,171 @@
    "support"
   ],
   "referrer-policy/generic/unsupported-csp-referrer-directive.html": [
-   "190aa5212f3dbcb1633b9d73bebebaf5e1bd361c",
+   "0a29f38c0288c34c23eea14a6053d68d6b19582e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "42be3b8892e9b98730c941ba2b82c9f36e3b7d15",
+   "ea712646bb16025d8bf0e40aa98104a490a7065e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "bf4894dea187c17cdbca30e3ba594676f8fbdc46",
+   "cfc379c0534522e175ff0326f9aafe72d4e49d2e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "cbbccd6cd4c8529525a5e517adf64e01b36f18ae",
+   "0d592b59d40b62543de7b7d2d25d55817f0bdc17",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "0e201a2d8eb9a1c1464a8a393deefde801d6bee4",
+   "8d108c74608fad1c9765c5d6284bad72e54275b5",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "346326f92458db3b1383eb5364054fef6585b70a",
+   "8a3731927e0f015697c5b56248a63c7345d2d195",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "91119cc9eef69dd94c3663f51bdeae4a14ffe2a1",
+   "463728a4ecd9cd592090b5be6648bf2d13251d54",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "25d9de531ae4d2773d77ce44cc472707dd2fb4b9",
+   "d5275be0409ea79c947503e825ccf11fe1912295",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "9cd52ad2acde6e29b7bed494541cc5a4e1f04e38",
+   "21ea496ca4911832d4fd62afdde6470fb5e90b9e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "51c7beb7690368f58e92898cedc711c7106bef22",
+   "c54ac62bfe9fccdb76c7897bf2b3d6d85207e322",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "06434ccb7437272799362622fc048c600168b5f5",
+   "cdcc134dedfdc84dce7975df662466bc56115032",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "9d80f4b1e72a3ef23bf884a80a8a80e2a29b1b34",
+   "43435ff17b2900b564d7cae86b35a47752eb279e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "fc18b7eb3cb559e4b010cf773b9aeedfb4938627",
+   "61b962276bb7fca9cdb6f247cbf6e691210015c3",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "f5e284dbdf24d633100ebdf979d55cf3a00f3bc7",
+   "0ac4282fb4175860d7beb8256437bc9bcd32b4ad",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "33f88211bd7ee7c36483b4eb27488f93d09ed743",
+   "ad75a53979dcf904fdbf20858080192491feeb55",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ef4c62e35624ab39d5e627b0ce2518722aad6040",
+   "0cfaedb10bfc4488d1c3824ede8de6ecd8bd81c4",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "f3eed251927b879838c6dce00a391db82baff664",
+   "3ef49b93f0f6fb0101e1ecb94d1cfc42a3b15986",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "15be1dbc74bba0a0a0b1a77fdb6b563967291371",
+   "a060a3bcfe270df9b3da7b9cb2c50ea9b90aaf04",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ee13316448981d3f55598cf23375dd343cd9c459",
+   "deb4132ab084ba1f8f0db78ca192c189de3bf7f9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "2e1190bda4abf85e855602a24fbad4c40e74f69f",
+   "793166af730eab51f8c8fe58f33352c7495c5312",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c77c6e692b1276cb4dc7ef4aa25089c8f8ce05f7",
+   "1737e72548c1378be77074d8d4cfc4307bdeadba",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "29b2e708b94397636ef1bbb1af50aa3394fae558",
+   "57fb4a946c1897e61efd7160ef7b64a58296bdae",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f7c4e35e2aa167ad4738946123f76aa34cba3dbf",
+   "c64034d2bbd16777ac5d20b18ae662ab59d3d984",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "7f3a6b8694506a54d947d905bbb07edc1f45b9f0",
+   "387f84c09bae3a8644ef28b0cb3db7734047b7c3",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "4ca9775d6bb3ea8f1fde0804c08026f1247ebde4",
+   "4d0c946bd7a58083be4fe854cfdcb1e7e6455705",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f19ff96c94570f1ac21bd0dd4242cbf0d1439bf6",
+   "9c769ba10d952c874289c5a7b0dce4757f201a1e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "23fe26c9ab57534f781db936863b6517a0ed9f84",
+   "2b1ee01973e73e5ffb1ccae3229e22d98b9f673e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "db8daa3957f3903205e4372ef6b2a11f083e1527",
+   "42665670f5bb6de4d020e40aab5dea56940d332c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "5093a462d0f3cf7113c267bf9cb0276679742158",
+   "fa0accb2c068094a4d718f9d21b69b145072c770",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "493fad2ae30b516aeaae44d35ed8c9301687fc80",
+   "59d852294b20500d5facf71ca8f112106a0539b9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "02dd4ec339cc66779f4494fa91c1b72f81d14353",
+   "e1b79bca8050de32a3a38ef93a89cbe42b9d6206",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "299fc9f626730e6c28564cc9ec5f1255c2f90d83",
+   "f0d321a52cf5a0c3c12589701b0c1bf55db97e48",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ad2f7e9f51dd504cbdb4a80dd59b4353506441ea",
+   "ceeaba32d598ec2d4ac74c2e59268b9fdf6d59e8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "f034708abaf3faede29b510d9227455451fa66ab",
+   "59322a856e01b891454f4b97b182e9cd217766b8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4c8f33a633491244356fb0a541ec57b1ba9bd206",
+   "ea8dcab7c7d3cbcda26f73eba6059a28a1085251",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "41219e4b5f1e8e603e7c7ccd10ba4fd40c150f88",
+   "5aa80479004486ae33c3b9cc0421db7f18608494",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "6c1bca655a34c01bb04beb4715fd0767b4b5cab0",
+   "df88f442fab55c2c019ea63aa679328370cb9fd2",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3f15616a04efc50cd8af8fecd317f05fd48d4b57",
+   "8ffbd3a852caff1dbefbd463a45d5d47dbc77fab",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "e0bc023c1f54830ec7473e72f39184bee78aad13",
+   "455efc4ae70503796438569eeb318d2ff1c1ee95",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "b841182703f852ba899ceb5596b25932760eca2d",
+   "89da6893a20e9b5957c0ee09b15a8d6172362cc6",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "dafb2477b9fe54b31b0db8ab48d06460c6c133f6",
+   "6b29a191efeddb78168ad7a1cbf4d1c5ceff38de",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "a029a7eae14f6fa712f6c6042ffe89d0c69b17f2",
+   "eedf34f796da2a92801d91c3d4b2504a5f42983a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -694394,7 +694964,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "06966301d0a82f5787007b9d1011dd74e36de20f",
+   "8b77fb7524703bad5ad9c54a4264e38b82bd7d67",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694402,7 +694972,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "26a74ef2fddca0288b625f86edb510aa860497f4",
+   "3e921ee20512d1adecf6aa9abf5dc05acb312297",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -694410,7 +694980,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "461a108d180a89e7d4b47cc33f3d52c0719bc730",
+   "c7821aae3f693ba5f631cde37f378e413687dcf0",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694418,7 +694988,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "caa18cc06902edebb9e7ac5733b7b0295d793ede",
+   "bae8956bf7dd3441d31da9c9e8520f61ede8639f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694426,7 +694996,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "5d9ba45af0e9685ab5fdcb710f7ac41d1b2a4e06",
+   "c418c5a27142173dfd416a795ff5e19fa7292e7b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -694434,7 +695004,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "a8305f77a2926a70e1a58384c27e78e5f2485937",
+   "d8c7a5467c56bef782dbe1b3efaf68a80d7f6bc3",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694442,7 +695012,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "387257aed3196c128267f651d271d9d5eea58149",
+   "437a2c703c09847bf2836d21513ed9f3297edac8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694450,7 +695020,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "163d9e7d4cae6d5f83502a37628e3037b8ea11fc",
+   "5887e73ae7a2abe0bb819d8dc9ec1562ab07960b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -694458,7 +695028,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "aaed1cd1248d6f5f6386feaf95a35ea110f503ac",
+   "e320e6191b6671a574000c5f7555a570c2b78359",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694466,7 +695036,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "eff18098e7108c14e1b49659029e7978eb66adba",
+   "fc100af00818b1e598fa8760713e554ca7fd995d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694474,7 +695044,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "79c395728ffe6355cd4c9d18e8c22fff48629816",
+   "c9810465b2cdec20f641eccf58bb2704585c8d96",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -694482,7 +695052,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "7ff6788142d4a45177ecea96dd67e5c70b424089",
+   "71c95f870ffa9183d14e2e60b245619ced2f7171",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694490,7 +695060,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "ad55af9e009edde8d90a67dd23e46da3b0417227",
+   "9fe5ef8a619b38e36e83266e06cc159acab33d94",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694498,7 +695068,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "cb5f93ece0a769f856a28df7b74dabedc92d6eb6",
+   "0901c1bc1f647ad666ba9803c18a6c9641a4d618",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -694506,7 +695076,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "118262cccd214469eded514caefb2f7ff173deb7",
+   "3f3bcb557ef2681ad0b0113fad98b19d735d61bc",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694514,7 +695084,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "df071559f7bcbdf32e38104860c3cbc972a4eda4",
+   "7a78d49b6411187729cb7b7d9a6a9e4780d3a7ae",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694522,7 +695092,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a741bbce6671c895c388301d0391f9645a939d29",
+   "51adeac1f1577e02441b559018b1316ac4c56153",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694530,7 +695100,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "66b527001bef1d624dab433a6fc96a00b67a8aca",
+   "97c8b34e5fb875615f9d75326fd67d68c5df00fa",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694538,7 +695108,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c22ac9819c59d28737e8cc52fe8c2d382a4a60e2",
+   "67241ce46163e5db9ecc697db16e9ad51e40ca5e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694546,7 +695116,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "aff550f0dcf567fa6ede2690ebc5907fb87ca870",
+   "f60094da322b33a0ab1c6c2f880191484046b6cc",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694554,7 +695124,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "be319727156f4a3202a16282ab4693579b75e730",
+   "183e4dd4367108481fcd1c101ca89bc1c9f41f6c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694562,7 +695132,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "dc1758ab70295d897857bbcf1e0af7d8b430cabd",
+   "5a3b4486d82730155537ea030dcf34734c628392",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694570,7 +695140,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "eccaeafc50240b5d686a05d618bab79b93723cd1",
+   "6144b6e19ba4ebadce84ed1b36939c8c163e51fc",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694578,7 +695148,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "5d608aa5fce9fe084d2dffb39f1378629cccdbc6",
+   "4fe4fe8bc0ddc96bacb0dc6bfe0f7ea30e6cc6b4",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694586,7 +695156,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "4c59595e0600d8ff4a60e21a0d85f63c5de30f8d",
+   "0ed931f885d3e864ccbec65d8e4eecd9195edb7c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694594,7 +695164,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "147088b7b2a2b31934118b85ab5da7161f1d49a5",
+   "9be57e4a592571297a88ab07e0e3e22cc0622f84",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694602,7 +695172,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "f655ea4eac68aa795c19260bd49256447703daca",
+   "2df7c747290f13a72ae2b0db24f4d4879b925bab",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694610,7 +695180,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "21d84a1deb1ba4c2d2d7fe1427acf94a8b4e4453",
+   "75d4b9fbe19a83a6ebd04b93ff4e6ca2c8cd1478",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694618,7 +695188,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "15b997587041be523457dd67b880e1b892cd1187",
+   "2a9392df1d64b1cc2efe4987e3ffd7fc777bde1b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694626,7 +695196,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "c5377a400301b6ba6b023376e274b02abf3ced34",
+   "028ee939474deafeca109aaa87caaaa25bf4b9a1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694634,7 +695204,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ce61e3e124fb7ec24af16d04d3dd5c6d85f479b0",
+   "66e42d84e1bc419dbd98243943a45bdaa9d546b8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694642,7 +695212,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "ab594bdde6026b09a618853ca69ed9e97d439f00",
+   "0fc1d169c9a22a0f2d585dccd36536463ae34730",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -694650,7 +695220,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "c515745a0026c5f9b1883cbd6d6fdabf343061ee",
+   "7e988ffbc8e84ddf4de79846c1138e47920d62ec",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694658,7 +695228,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "85f9acb33fbf796417a50e64a546b8e1754817d0",
+   "335fde0034b4a44d8be0f98f86951801a8335f34",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -694666,7 +695236,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "56db3510a7a557ae110fec3c36bbb6bffc880d85",
+   "3ab4e9b33a7eb3afbc1c90bc9dc72e367afe0fb6",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694674,7 +695244,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "1e942bc96498094360276d2b33cb2cc10e88afff",
+   "c8946d88a006db7e3359791bde36ba3eadb36d22",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694682,7 +695252,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "d8b7367afd336b606f68da427a179ca21752c650",
+   "e79e8a057422b9264d119aa22563df314e65f8b9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -694690,7 +695260,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "970122cf57cb44bae7346df90233921a0038535a",
+   "cc5ea2700e16603f28a3fb85ed150b9e48807037",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694698,7 +695268,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "1d9ae9943a9176156692fea6a400ceca1e4ca903",
+   "759625f622c159d0b5d811c51deac8b6e54d493e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694706,7 +695276,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "d7dd197d6a2312362601974d27a1d335776bc641",
+   "34c39041f990e91f539d4f14dac5811f4f099507",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -694714,7 +695284,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d3d58cdd05553e0956b7896f15c313a246c67fad",
+   "9301f0b2719c1c025b50dee3e17f4d616944a54c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694722,7 +695292,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "2a2832c603c2504bd6aa890facc98278975132d8",
+   "7b9a33f47e4ddf38267b257bbccf70858adc623e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694730,7 +695300,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "d749b1fb5348d58a19be766762ae727dc40c73d7",
+   "3303e355a48ce49414ee404db4c3fb325753ed70",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers": [
@@ -694738,7 +695308,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "6ea648d497db6af3a4cfefa64028f05108cd12f4",
+   "932ac4e18f99ce3025e6131c83abb0c2b5ed08cd",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694746,7 +695316,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "6452e1895359bc2ed0fe7779902b63146b31ecbf",
+   "32dac4bf4face0907dfade7a7611bf1241fa0f18",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -694754,7 +695324,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "2eea5bce5c2ddd26bc483a630b8cbfc27473e01b",
+   "88a6f0b3283fcd5b79f56dcb0b3a669d69de4bf5",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694762,7 +695332,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "eb402eb930ae3452cdc2b27a8f2d88dddc4719f2",
+   "0caca74b53db5af13c73ede1ee6eef0beb50179d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694770,7 +695340,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "d8f2cc325f1806aaa9f7df6ad03d83241f56acf1",
+   "f6215762acb1a2b3e3f433bb69dbf124187492e7",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers": [
@@ -694778,7 +695348,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "770aa2196c956f7522f300899a3a3bd51913ac41",
+   "35123332a8a172ee519ccc84ee1bcd0edec0edbf",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694786,7 +695356,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "cbd81ef8c9b9b7233c652ffd3fe7ee6e8e910c8d",
+   "757b06bc6ac19648da21567e9798bf97702115fe",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -694794,7 +695364,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "04a71c73283791bad053abb0b82752ce82ab7022",
+   "3044b007cd99a4e6b7d826c8cd8de93714c6e6a6",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694802,7 +695372,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "666f273d48edfbd63ce462c6dac1037aa1835137",
+   "2f61fa770d7a0412aa27e42e37c0bd107fe19f77",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -694810,7 +695380,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "9e0a6320302cbc6323e578cd53c27db299276f03",
+   "fbbb9efd93314b01713230fa4866eb78f7b05141",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -694818,7 +695388,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "5573699066aa5d3e06e97c85bfdc14b21a7b6960",
+   "93479418ab5901ffe893b8c15d543834dc636e61",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694826,7 +695396,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5cfb653e61114e3a1b1e2d0f5ca83c208d28f3a4",
+   "8a6ba540eeace78cc19fe0d31270ccb8bae4333d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694834,7 +695404,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "4467c6fc86e23c71b4c86b1077103c3d6bf192f3",
+   "de595abdedafa82b1c7b89acb49c112050209dc8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694842,7 +695412,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "20c6e6728458f9042ac28e7290a887c7b7eb8930",
+   "07a1ddc3a026b285d641b47cdbb7947b8885aa78",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694850,7 +695420,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "61c183df1e9eededac063bb929296ab545577d92",
+   "47c96588dbffdfdd242fc4df55e4e54213df66a1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694858,7 +695428,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "94a55f631d5fd42d062ab0abebd47683d2718f8b",
+   "e047b17d41185bc9da7f6cd5545dc5cbe3c36688",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694866,7 +695436,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "6572626f169820efbc07a0ffc95352caa444cd79",
+   "404e18bd65477000532feb28c32efdfb6e6c22b8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694874,7 +695444,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "052c4f3071c4e0bcf53e90f4dabb6a5ff135b868",
+   "246db4570357c1fe090483b95a748c7b22a4db64",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694882,7 +695452,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "7a639efc055eae2ce052e8bd6ac9d6f6b39b44a6",
+   "0a2a0f026c63a95e8e6c26623ad52800cb210ffe",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694890,7 +695460,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "35ea0233668c750eea36befadf9ac8a243f82df8",
+   "b35d8f7f4f1d7d434080dae8d3df7f1d2990d6db",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694898,7 +695468,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ae707095f0904345f3f721bc6b747875a77c500b",
+   "aee79e7279e15a70845009cc802bcef41d36f7dd",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694906,7 +695476,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "5efe260b42e3f1b0d7ed46a0e6d0a0a568e1b779",
+   "e1ae930f78b59ff18765f3c29a19205bfea9b4dd",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694914,7 +695484,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "46d4d6f770f11fdf8ba86fdfa2824df7d081e7f0",
+   "5e871b806598baf512faf339ce95ecb7b361a420",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694922,7 +695492,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5c177baeeeed514f50c7b6001b4244104b97120f",
+   "c606d407a3dbff162c084ac11ca1ff9bceffded5",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694930,7 +695500,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "48ba4fbec2a6e39e97b4ae1a0bcbe2003ea89360",
+   "bb9ccab8126606353374ff9bb0543e828d19841c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -694938,7 +695508,7 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "afe482af2373e83bdd260fba28409402a2c8d692",
+   "4544ade5134d735786244e15e0373171663bf1a3",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -694946,447 +695516,447 @@
    "support"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "0c013c4f0dbe72fe4148cf8314d1a8b7d1488d4f",
+   "14d891c6ca0a6fafb699ab3f41111d1327507838",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "ce637b53eb7fca3ae2685409e4170e7f31c5f9e5",
+   "7205b5b5e20afd7529acfe3973b755bd9f9e34f5",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "d48760a422cab3523f5b433d9128d428c4c40c2a",
+   "2bd7f7f9f96c7af26e1b7ac7e237f31e863a2feb",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "06a9d7d4a72920b9d8f7af2223e8d4c4a941abf3",
+   "6c941b98affe9791cef3d5a87166e3c0bf36c571",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a608e3ae09ee0a9d3e929262f5b57fc0090a1d77",
+   "78a12c0faf78d315935f1d2c049d47e20d9bf534",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "d6e741e3f6221454ee7728a249bb2fb1e90d1186",
+   "8cb3b1da63c48298276ff3ec6749fc2df98e844e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "c39a1430b2081f6baf04400ad4a24411eacb852c",
+   "98b574b0334f1ad7d2d123182f9a5c4c1279db06",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3b97f957b2f51d69e37fdb542d0ec2e9d6af5cdc",
+   "f6755e99add4f8a615fa20645d01de2511c82563",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "b67f4397f7a8be101701ed94e761aade556e8ada",
+   "9ee1de48295f458eba00147cb56171c95e16c428",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "19fdfe685f3e955fd9dbdb4556e14d44fcf09e98",
+   "1f0b254a2a1b236b391c1f8dcaf7a95c9e9f246c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "f6e26655cc5948b135ba5851d51ce1377ff01330",
+   "85b47db7c49082f36a4baec85a5d58db52cbad0a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "6e2a592ff5dfff5a409310d32dae56d85ce1da9b",
+   "e2b6315eed71a4ce1b0c46a125e306bc3839ca86",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "cd5c2c08b4c11fb02a0fbeecea1333a36e6957a0",
+   "8cd18a658d0b849b47878d96ca987e6e80104481",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "dd579ccc99cd66b3bd4e45fdc318066033249a37",
+   "db8b65c9070d18eece1e03102c704d19e6e9ebe1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "b5a8188791173eb79ae6e1e76b91d8d3436da56e",
+   "b37fab1c7d1e4cda18d7527624110ab309d54975",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "27d3900a4a81282aaa944cb1e0c88c3b00c65c02",
+   "a8967e2f0077d43ff01615404f7e30a32890d12c",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "912f99924225455493ff334221781cd381fcb027",
+   "0f512823e8e0aff1dc30b0a5502209c7f345480a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "42b7874175795d69436f02f26117c930eceb2837",
+   "1a7931b10169f9716cbc23a3de83dec208227151",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "421d4d9e09fb19b0497648592732c06cf5707710",
+   "7c80c012b343737c9b7a21baa2a03a745f189812",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "397ad2d68332f4c6c0bb0c4535114d5d99e982f2",
+   "221dfb63ef9542615e7f36c64f009386332628df",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3f04ea7736c4449acd5418f39181bc214220e67f",
+   "6373a785fc27360812350738eba09cc2ff1584e5",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "77605609762a9b5dd04ed5a6019f6a0e67576925",
+   "20f91bbeb1d06a4aba31ba8c1e505b4d60659402",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "59a8041e699ceef729fa17ae89f8d4f39fd27161",
+   "c20b8e0eff6abed5af6ad34d2493a4abb0f013eb",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "08e3f97c09e043bc8fdebcbe22e9f16d87826c30",
+   "44b8145030a8405d45d1b6f8ee2289d6b6b9d997",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "e3ca9c6ab651036f36d862a965e26143a57ea33e",
+   "dde31a65bfcb1601ad5d90fbffd44c19d9b0ce6a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "84654cab5dc3e9052926f4315b9c1523a8970fa5",
+   "98d1e9812043b069927a4cce24602ed353f2cd1f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c56716ebd31d34fdeccecd1a1ef5318766670215",
+   "e6f1a3e27c8c8e3532f6ecb42c70845ec4a1cf52",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "22ebf6e76b8231a62c8a87f85d6b78ab9a331d53",
+   "4737eb59404d345353e3902e669cbb57115f76f7",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5eaa959e054735bc98d93e0a6b520cb45321d55a",
+   "41018d5e2c0495c6e37dafa63810837fafe43f41",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "132eb3cdd939fde04da2dfc43df95aebfb281d87",
+   "adc9f952d66a29c6c0f96f7e304e526eb1bc5fb4",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "5a0aa248a97b24f6888e2973ab406afbdca000c2",
+   "2210516aecae7941279fa49f01b78630ecc383b1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "02c61798094fe9f13dd2e3c337e47c0863f15f14",
+   "43fab7d570182abd7b704868cec9a94a3db92939",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "9156260a10f6299dfa4bae9500d6dbad0523bc32",
+   "6a5f3c4fcc596b42e5526074503660605fd05b93",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "9f232627d47f1cb857f7d7f88e9b844dc3841fc3",
+   "1f280d02fb431008f260f9de8d3ec7f72c3e3063",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "ddcc0e02cd84ae9e33e33c49a716e1d155c18013",
+   "603daa98f176a1f22da1eeb30e5ca3d5a719c7df",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "154aca212a0823118dbc822760f48e40cc015d42",
+   "6ce64e62d249e7560e0f4e415a541dbaafee04ef",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "b171edf427ee424ba5f471ecad2f0f2287f61514",
+   "93075883216d0535c58d56dc2a3f6e22590cdbdf",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "45ccc753e0804a95e80e4be1da8038c092b26399",
+   "ef700be75056d90db09ec3a11116d7f5ac443100",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "f2940a424d1525cbfdbff30081df7524b5398ca7",
+   "070e6a8817de43ed65f46342397c32ccfc940bc4",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c4fe80639d400c7ee7574c173c289323ef0a70e8",
+   "7784873f7f3f7d5010b5fb863a299d1bbec631c1",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "c6915f8341a7d7ea8aa2589d139a2cdd284184a6",
+   "917c0b88847819501699fbe6ad08a051733f3376",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e5d0b8f3d10ad52a6600f1ba4bd91503536b2009",
+   "a00848a63ec75e51160aefc01705414596466ecb",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "6a6d1d46e2815d520d827cb031a19b27a1d91809",
+   "f75b72157f4dbe42d31ae3cc3a31971c7965b291",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "8694c941d274a11426429056835486bbc4334428",
+   "f6367edbb2295c0a9a054ac06cc6a720a9ec04e9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "19fabf6fc375f9f935f133646d27f52c952832ad",
+   "c603a42b7c599186476d79d8d37869ef13a35d40",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "e3909a54f8018c00935b7df0f6d31d89c06b488d",
+   "6d303558e7ab66aa5f4a1d7124514f20815b8518",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "754bb727a07cf158732e9758f44e50351666b5cd",
+   "4436fc516bca5dea59515170474d683d5f51ed00",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "11df0d69acc4596e9267d1df7ea60adcb3ceb234",
+   "20047defd66fbca528fe66b0ad022aa131e40c0f",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "cb2882b62f73b68ca253eca51056db38ef717bb1",
+   "966abff838de5cf46e77fa9b4aba9f8c900e2cf8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "bc28f2bf84fe83674ab5ff9f9a577b680227658c",
+   "c6ee143fc889c80d59bc995374de5571f4f35e60",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "233ffad485977b66fe09ab48ebe4a3613be1c681",
+   "7e239d69affd311f8f89ba10f516627382b44c9d",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "ee95a6ca6fbadad83a1266ed0bfbfbbb33189476",
+   "31c3b79a581af0ab640f99b23c07c30bf23f636e",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "3a0a025e72dcd50294fa2890dceb87ed2990bf05",
+   "6eed03783b28a6af643a4ee15e0e84d4d0308036",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "decdcef4b9d0cb148ec1b55c1d2de55fcfa9f881",
+   "61a5e51e637989de96a29ca6e3d4766747e9eca9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "bf1e8ec167b3becb41f6636c66a400cc4cb399a0",
+   "ebb93af5050bc08a0d6eede2fb8b83f3e9d27977",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2aed2d235a6f7184d0030fa0064de6d690de0e11",
+   "7699f0f96b68014ef64861c20b42580543f56c5a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "80ce378359792dbad41d37eb0abc2ad948aff0ae",
+   "12f4286f8d8fd23ad13774f99658556aab2e3525",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "66b6c28112dbc42d981e899b21a926cc4a3fd38d",
+   "e44a4fc096e5d6a5e42330ceb4ce0f5bca850321",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1b67ec6aca188cd3f28aeef5bb024f2510c77624",
+   "6a338aa72ce3c11f1cb54fb20ec67ec3b0643a87",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "035a8f30206320dd27f611b9cd014196ce92f8b6",
+   "5c81707fb553feade3e1e8d1be5d31927893c960",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "912a9a13dbdf1aff90dc716b3722d5940ab38ef3",
+   "90c65ae6e87e80cf4c140bafa98d68168f7cbae8",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4a329a1f3debad00bc32419b26ab06fc9e54c88e",
+   "f4bdee5ce8681848e3add2ec9836f62991c93279",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "8de2e24297a2236dc818ddfe3a04b6098e98c384",
+   "5e12002f256403ce8c705288c4f355b46a1a6965",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c6c75eaebd6ff06f4f19dde5d931b19aed1aaf85",
+   "134f342965ed71e8dbcc1d25ae265561d9302e85",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ee046e2aa401b1213e42e7ea68f312b32187354d",
+   "ee71a0d6f04d7ba4669293235131da30401db251",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "b65e1a448a47483f22c8d1ac401a240f66ac4e35",
+   "efe2c0d2f95566129454401f2830040f21efdb7a",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c216046a1e03b555ad66863073eb815e4d4cf37a",
+   "83ca90175514b516532cc3b609fdc89c6a577b78",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c7844b8d79a41582dfacebca6c738de4da0b2cde",
+   "c902ffc410fffc0653d88289413e77834239f26b",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "94749a5e4e58e83f38d1f98c62c1c9e250e3aacb",
+   "7bfc76565764d7e991e8d44929c3f5319b060501",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "3bfc3c546169e73b0991efedba270683f4634a91",
+   "c85180f01e189dc00153ccaf820da6cd35390565",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "15d6d703128069383f7af6c5eed133fffa9f88fb",
+   "d0ab6e1ccbef74310faf625f60d9af70d72bc1fd",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ace01a8c14fff291f03b2ec54b920b610b6a4f88",
+   "8f5b1a70b2142dfb6320ae13d44c60b2cac64b2d",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "87a3d2c6b18cdc42b37cc63bf150f215ffaf0ee2",
+   "086c8b1a047cc3ba7e61205a60206e70e993466c",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "07bbfd3ca362f1a730d81f075e451659a34736fc",
+   "d0e05376f09fbadadda908b63a078e32fbd7e051",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "f881b1fa9047c3b1898c3729f36288a91889e5a0",
+   "74ed8a8903d259d0d87b1b3b533139f5d319b240",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "019d330457e3be1dc13916b6f7b7d45122920839",
+   "41a4c940c123b583128beb4108ba9b3015831712",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "57670bc869705493da226d191ec2209e8ded5d66",
+   "37879ce158dc1f54d51f0c55ed0e13e56f0fd2fe",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "e4efa6eeff34bea7a77e9c7a4b9fa921e9d941fd",
+   "7bab6eff28eabbc0d69644c50a19187d35833fb4",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "a3b162e0b1fc71c97dd0dbf500b2c6310ed3626b",
+   "b874f1970b1bca5501518450a7bb010564e39037",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "81fe68ccce972644dc8d9304bcf9277b5f39d04d",
+   "ce4957f92f0627ffbb6671041b6542c0f178d110",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "59aa6a99b7002c5887f0faa44f296d91ed305e5f",
+   "08dd0a18a46d224e8b1cec1af6c5457ce4d58d36",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "429fbeb81fc1da7f2238cb3bc6c92c6eaebcb467",
+   "d940fe023d54829d7ed596fed8cda5494443aa1c",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "3c06d7398579d5e117020076064af0d77169d123",
+   "ae67228e393ee75705d7bc4ec3d5d2f1f700b847",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "d17bf1c93c51f9fe771b69fd0ae3c57e1d7b2e19",
+   "edb49e27f2373a118de1577cbed512295881f4a3",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "bee60557c6558b5ad6a9caaba4f076139698d97e",
+   "f48a02175888868fb4c780ccd50b6912e98bf9d0",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "4d4e09bbca41948e6e6e2f10a06e8c35194278f8",
+   "795774b4006be2c6bc9a0b97ae1dbdadde07945e",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "7d78a9e44e95cf4d3d68d58860251024c5f825d6",
+   "8d4143e4ab99b882344ef6834c6f19349d7a42c4",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "2ab167d0ce250b5092951c62d19845c8a64e186d",
+   "68547fdbb73d4ee73789d666e7972c543a14ad48",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "62a67844560931795efeeb2b7f6a5e5a8066de9d",
+   "acf4458a1689b5c795a95eba30e6edeee0aff946",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "1bf40e66f2f03fda5d200dfd7205937694e84c69",
+   "6f57c7c4b2b9558f11798154d188bb686f6ef00e",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "549851abf844ebd1159924300b026d5c69d0b25d",
+   "e2404361ecd2bbb8706856973981bc90bb249e6e",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "c57951a0a2bba01cafb99d3f91b2e2ddff47fc60",
+   "66660f05264a01cfdce44bfd97a038779e88e6a5",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "e7a22774a22b612132587683bd45f130eee2918f",
+   "15e978254242857952ad19120cad564ef067c1ba",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "12b8220736b088f80a7a9a1e4f1a9b87682b854e",
+   "f5e38ddb803aa273661507ba2a42637341779fcf",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "47e76c0a1e2fc282d0e16d3f914e5a0af7bd5481",
+   "20dfb8a3d66188260044fd662a9f3f149f074fa6",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "67e3d38c17e7e7200767c721eaf50294390b8e62",
+   "661a0cb964cd6b0b14f7a277c870bfffbd7353d8",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "184a637ed6834fc5fd95a36adc2242ec65bab077",
+   "4705a1988873dac499172e22df4f36c344398403",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "e7b04e82ed7ba0d7d6878842bdbaaf12a2ed90a5",
+   "66310f711b537dec29306f740c8cb5f5b53da190",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "42977a1babd89e8bde7f4675e347d3ac758159ec",
+   "79be70d7587779fcfd23529c9251da339455790e",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "846b585792e49652f16de56549d6039e7c514e82",
+   "d3a7d9627f3b57aa3e07d62e4b943dcf9a17772f",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "be8d5997fff60e125bea1adf968a63fe4dde03ca",
+   "4140287d37986189912e979a0a75b4e627e2c8b7",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "629f4649ccd7a2919fc5462cee79df4284cf57e0",
+   "0816608f10f042d610c7c469a5864a7bd499ca57",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "ff78c96c8d4ed45351d4221fbc87cb53223f1049",
+   "4af019d39fb30048889d743c6f9653451327524f",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "a2d94af9139fb2c0e9174be9734eee1be0e5b10f",
+   "fde81606e41dcf5948de750eb57272b14a6133cb",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "984eb926b7ac5b7f373ba2d25ba8fe66397c113d",
+   "930a9c1450c6133a6df2d1eea83cb9a5fa5a4022",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "5cfcd569d69f8f2e419180c6e0c6abbe3a9e75a1",
+   "8d08d63d72816a0814a639fd708966c0a921ebbb",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "b8fb99174fe72acc085433a6c0c263e045e6680e",
+   "dbbc89ead389bafce662b3444d7411fc17db4a1a",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "9f0f9884e5cffdfb1af59d7f639f8a0d413eaef3",
+   "a190ee179384a86a74ac1ae3b901010c5a984d30",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "44044767d1de4040d40cbc1e1e3d7ceec6eb6576",
+   "3a1d16bec4e29e788a970864066efb681b38ca79",
    "testharness"
   ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "67fa569157b3ec0f18e26ead54cc5c982947c674",
+   "572d84007c955b07ee118f90ce179646dd9bf1aa",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "0ac870c47c5ea36ae4dc1ab91f509ad5e12affa0",
+   "c1a8a0a0bc23076f71a86da443b196a11377cc10",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -695394,7 +695964,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "af7827fed49f561b7a3485c8c453d10f9c916359",
+   "c5726ef3701ce5a800c7aa4cfdce28022b87133d",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695402,7 +695972,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "0bead7943fea2ca82ad0b95b7e43e2de4e70cf93",
+   "a851d5bd81852bf0ce2336cd28a88fc17711c19b",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -695410,7 +695980,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "27018f7b5507ac4bb45eeadd4d145b9fbcabda95",
+   "54e6d02028178da90c8d2b534619f43ee2d70746",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -695418,7 +695988,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "995e8e10a88e672f682e8c5b85c8025b76129e8a",
+   "8250944c36f9ceb567215864c1c33a769f0de702",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695426,7 +695996,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "6fec6ccca2878ed6cbfb697321c15609f6ac628c",
+   "df0fe535c15765f5356c92c06132f1df8616c27c",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -695434,7 +696004,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "b2728cfa0c1366f2be9986f4200e86f599934d85",
+   "e56f9107aae879bab2c5f35c2a045e7639366960",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695442,7 +696012,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "23b325b573dfa6ba35cca52ad16f59ed3c462203",
+   "a47e2e0c615533ee25895598be4ab62b5488d6e6",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695450,7 +696020,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "b24d53bd2a13d7c97ca1b92146ce91ff7ba1b6a9",
+   "3dd2c1247dcfea7cd93bc2087da3fafe0d5f9193",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -695458,7 +696028,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "ffb70e5b70140499a7f5362c2ba0614a0ca5cca9",
+   "256db1aa5849b8a2b885ae07e3bbc8578fd74a8a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695466,7 +696036,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "a0ef0088a2613b094b8793c076339a6a1cdd6dfe",
+   "7c05f53f14fc5ab58fc26f855c43a2206b9bc512",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695474,7 +696044,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "6022c1a8927fa5bafb85ea46d52429653a551c99",
+   "83a91abf2bd9cb353da80067c585c8b3d065887a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -695482,7 +696052,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "affaa0c387ac5740ce248a1749ece12127d9bc0d",
+   "461fce61eef2632281db50903bf79a5692ad42bf",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695490,7 +696060,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "4232b25a0f64c92e4454564d587818cf281618a9",
+   "9d5a65e3171a4a170d55805702c241741caaaa5f",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695498,7 +696068,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "c0addfbad604c436769f4c07608670849f85822c",
+   "2691218635125993c3dff3c307a895dc133d1338",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -695506,7 +696076,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "2595ff89e78709bd70827f98c556f341ae705ea4",
+   "d67f6bdbfba04380e6b72188d9757f0aac7a19ef",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -695514,7 +696084,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "f5805796344ec1ab269eb0b43d65a48eaa973b54",
+   "e1a27e3fbae7587f7bb8c921f86239a65a8cfcc2",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -695522,7 +696092,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "7faa8adac37bce286b75a984394fccb7db38ee8d",
+   "bfd73c92dc65b50efc922f48ca34e1762e8568f3",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695530,7 +696100,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "d0ee98496e32ca961a69a4540a508c97231811c1",
+   "4b61d4478a52a60bf3f95add7677752ec4cab129",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -695538,7 +696108,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "3ad094a328ef0fa5e8b317c5b9bde74d6915bdaa",
+   "eb4e0b3414d0511e36f9fe370e6e41398b5322e8",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -695546,7 +696116,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "50f2649d3f79b883843d473a6641ffc8b32f439a",
+   "7ebd1199cc17c7c43279da621ce8f36f44954364",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695554,7 +696124,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "07abb8e5cbf474d34fd99c200bd64cdfb65e2a2b",
+   "4567526881470cceaa21e2086f6c306a069402da",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -695562,7 +696132,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "964449d26635f750314e9d74bcfa4dc9acfd08e0",
+   "fecf19ce75a9c890a0661dcdc9366991f121d46f",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695570,7 +696140,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "94bcc64d46e5b963e5480a81e780260439da9031",
+   "8a07db8736e2acc769c4c7fac8ac54b7d5dfeb78",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695578,7 +696148,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "34079bf89867185fa51a814e7ef7c54d8d3db3b0",
+   "ab0b3501c392ba16fa2e0aab9e09b6fc63f67842",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -695586,7 +696156,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "0ca38518196fa44636521fed90b297893ee3dda9",
+   "3493ca250b8bc0a4cad9418e707e2b539bdfb924",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695594,7 +696164,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "366db4e4be7ebea80641289af70a541228af66cd",
+   "fe714d038bc38868b036bf5fa346c8db5e910995",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695602,7 +696172,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "f24392c0915330be386e5194e558c7c670298f10",
+   "82002683fc994d4d6185beb62d7daf4f5feef43a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -695610,7 +696180,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "7142ad4f6ea63976cd14907051528c6e04904ede",
+   "f84861f792a43b3b0e3228defe7e8202320b1f29",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695618,7 +696188,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "0fe5285587460135aad2c4a302533070cea6ff57",
+   "8482c8ae977814983da5e706d92f8e3f650ad750",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695626,7 +696196,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "733db4a841ebd912fb4fe5c07cfbe3154bfb77f4",
+   "48168636f4206b5f8ed17bd9a99eb1dca3f50e02",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -695634,7 +696204,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "81b4f4d86fc8f0dcf57d02e4d31b34cb36f85fb3",
+   "aa3455bc2df6681a97d1655a0f7c45146d4ee8c2",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -695642,7 +696212,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "155d48f43a27d3905afb2cc4c9c29049ce827981",
+   "121bfdfa4683ee7197370e56e7680f7b756d8874",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -695650,7 +696220,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "560c9a1227d65efb9c027634c9019cc014f4e464",
+   "ed2159b64735b1770a2b2a1903addcab2a42bb93",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695658,7 +696228,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "a677f73429bae392b392b9d094121c317068de40",
+   "4495c5440cb36508d657fb36ab8fcccb19456bc5",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -695666,7 +696236,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "97e792bcfb9e5ca4467f5784ab12ed1564b96921",
+   "eb067ac7967f98aefae9756ba24f2d549400853a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -695674,7 +696244,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ae8cdc91efbb60eafd7da71fa16e4d7256bb03b0",
+   "72b43aa993607e39673fd7f2bb6739bc9f8cac5e",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695682,7 +696252,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "df52f3058d595d7db0b1278119501537fdba9f31",
+   "d2cf0366dcaf91ef915401017e2db774356b9aa1",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -695690,7 +696260,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "4c3c0706090d535b4b6f6d2551717f282934ae43",
+   "34d467754d9014e74a2be9de8f634ccb897031dd",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695698,7 +696268,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "7a9ec93295cd62ae26acf54f73f6c5df34f9ebfe",
+   "637b156a282d7fbb6367a8fff6b6d0e8dda9e312",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695706,7 +696276,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "71bc6bf37afb23911623253af56a587abe927305",
+   "ad34824d58d989bf8dcb02ab188bfb27fd8b4556",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -695714,7 +696284,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "a37cc7545f407088f4456f5afabe85f718ccae81",
+   "f89a079a5522fd26ca0ff369e816c521c5066b58",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695722,7 +696292,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "420d190d6c7151ec3ad4bcaaf02cac49ccef687f",
+   "40e0fd0a8101696e5160f27f1f573466dbea3b21",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -695730,7 +696300,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "e5509fa01846fb46056d2dd270171fa764ebbfab",
+   "a8d3c3ed2b640feb3af9b4cdffcab8dc2b234b9e",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
@@ -695738,7 +696308,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "c7b2fdf2e35806bbf1b2afbc1732eeeb840cd518",
+   "df047a0ff44e60da7685e4aa5018086b271a7d5a",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695746,7 +696316,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "d3c9121b537dc85c3f1a2400f3fcb527b15b5b87",
+   "6454292d6f0ffff30293b70c247be2dcc4390361",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -695754,7 +696324,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "c4bffccd640697a113ac61e9f5329a2a11488b74",
+   "9a9c91976d889f51db875884d6ed2409e51858ce",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695762,7 +696332,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "e6f13a4cb31d526b1add64cc986cce4aa5fb82e8",
+   "fedae8b7f7ba3b0ddbab6c2eeba1e402e02ee90f",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -695770,7 +696340,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "dd3faa6b87ccbe839df938c1d25476a6e4687f87",
+   "31892705e0f4ae3f8ad112b62b1936240177ee3f",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
@@ -695778,7 +696348,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "1ad2fbdd20fc9d03f1c0bf9bebf0fd9bcea8b02f",
+   "c3981366c5d6bf4dfa44d69dcbc8e515c8535578",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695786,7 +696356,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "295fe6e58d40adc2f7e38fa6874721ba25cebefd",
+   "daf2637065ff39c38e78456ac649f8ef3249c3c6",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
@@ -695794,7 +696364,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "bacdc0b2183827740928655dd68540bc41501a5b",
+   "eb5e616ecd612bb803779be517e69fbfd241d250",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695802,7 +696372,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "54ae74c6b300bc301addec4c5fac30e03606f115",
+   "abbf8fcb9149b2baa5da1b3d3bb2911706da1731",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -695810,7 +696380,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "9826add65dfd3992dbf40300e42c9b213f3a5d6f",
+   "b5f28d2d6715d8d3bb490158b850ec79c8277d02",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -695818,7 +696388,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "305ba094ce9a218b174038060ee3e039ab712a1d",
+   "3780ae41833ddd01d7bcf3e790d9b2a406601812",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -695826,7 +696396,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "0c85bf84eb647b1c1854f13fbd7239311a4e1455",
+   "e40426f78a8bc2c6ffd5e81fd082e6ebc40f93e7",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695834,7 +696404,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "1f6c3bc7ebf47e9f89ac74567de0f0fce4c3f3a3",
+   "a4bd83ad28451fe33929346895d7b9fc9f9c26d0",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -695842,7 +696412,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "af59665cf4e88317776ce8d64118e4565fb0a0f8",
+   "6696fba26b30ad3f6638d3314bbd74d19c09b915",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -695850,7 +696420,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "fee454c3d55f852ee58fb86e19921bfd92abff9f",
+   "fbb4fa45f7dc5d5b56aea75a3ac47e267bc98ff5",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695858,7 +696428,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "b4b8a21a9d2949c9a1bc95af27fbf39815693127",
+   "35af16f4dcacacf6ef56335dd339dfa21d870763",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -695866,7 +696436,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "1c3f86a913a816323e8ec546f6e5e10a06d246ad",
+   "0c1af722041020338852a01b733db81bcd2624f1",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695874,7 +696444,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "7c93de3d5e89c96df44db40730e8da2b64da8141",
+   "d2bc6fd484272f99d7350bebd7d04c981429d63c",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695882,7 +696452,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "4b89570dbafcea8d82672f1e4527756124474267",
+   "7cdfc9bd414cce2469ecae938c5aed125cf6201e",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -695890,7 +696460,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "fc779aa86522dd6b356a1c8bf7a29ac716430d10",
+   "6a1d773f91b7df881e39ef5e06a7a1b76493f019",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695898,7 +696468,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "3fe0152390f485cf77504422e46f562e99d3ea6a",
+   "47c4a60aed7171e3648cc995f6191f34c1fe07fa",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -695906,7 +696476,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "edcf827aa2d7dc2ec49ac809e8011d606c5c9678",
+   "9e95ed2ef1bc611fa488f9e19f329c2183bf1318",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -695914,7 +696484,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "346602564119297f9ce9c6273a570307ccf99c97",
+   "2a897d97add20d1f759a6e7750fc2e6da3e90953",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -695922,7 +696492,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "469d8f70b05d43eba6d0d5136c55084a3c8716ab",
+   "507432c9db1093c3803dadc418fb4697fe606a97",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -695930,7 +696500,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "e71021bade634565bc8f73a909c3bfc0a1bde4ea",
+   "1a6cf6884b9641694947065773c2bd3e028774b2",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -695938,7 +696508,7 @@
    "support"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "840a1f7a074537052824d2e32938629af6e64c75",
+   "2b7beb3a4bb65c63fc672f9b49cc492df742b2b6",
    "testharness"
   ],
   "referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -695946,447 +696516,447 @@
    "support"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "374902ef366329f88b656c37833818dfbe043eff",
+   "ba1fd4a411064963389efb295e796a45cfa8b6da",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "e2c2cd4dd566540e5be78bd3924bad3182e39a03",
+   "43df09f493cbb7bbd707cc9fbda62c19836975d9",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "9f17129a4b5bcc098eb7381931871c4f30c48bf2",
+   "346c0165cf27fcd968caf9d53b5496cd16f292c7",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "5e5bd63da048c903e071626801f7e301d4146749",
+   "9c19546b28b39bdd5ef06ac3b1a0ef7023c5a7c6",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "f94b5d59213b3702fdf4dc6b1feb7c16b57df3f9",
+   "dc74b17006404b355ad106c3c22f64cd64ea516f",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "ca07e20706731193431f0a720cc20ca0577d2d21",
+   "0726049eefcc9de3102576323c0e9d1c8093e63e",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "df2429b6a25daaebf6af35bb29ce8fda1f41d5ec",
+   "93b5b91c1619a052136569e93b5738dc48044f0b",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "f103376eb3d1f1db3c6bae032c0e87963beb6191",
+   "a09e04cd22c2a723fdf60bc8573bfeecc9e3f4ca",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "2af6647bfc7e1de57cb11de83678a891ca5ceab0",
+   "9981baec4babe9416ad667f22a95a34e6d8a063f",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "90148accbdf483c938f8db40bfc26955169ee07e",
+   "c2a92aa157e3240e589abf87de0620682140356d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "4c6847caf27ee978fbd114929babe58bad29cffe",
+   "6b094f9b36ef7d4d1bd4f6baa6c89cd64dddda8e",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "1f21cefa068cc8bca80bb7a55df72e6f9b4b620d",
+   "fa473268c6dfa775dda317b50ccc1b821bd75aff",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "b56e5b8524b809526a32ae50516567890f543b88",
+   "2f8afbe8aed7eebb6ef6cf0684415b0bfd75458e",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "6b9544a0dde6c3b78731be724d446b97b6f49ce3",
+   "65cafa2b4f93162958d97321f8ed9d8e8898742b",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "6202549dcc23e6146013c943b351f7a5eb27a774",
+   "21a268827716623a37efadf49678ae47c08dc4c8",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "d031329a3f1553da5f82cb4d21aa2966ca11cfba",
+   "ce35564bf9d53b15eeb5b4ed1dfd0b7daf95e352",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "6e46166057eb5b9c891920b22f58fff80879cc85",
+   "80165257482017b8d00e0ecafc47097d68bf47d3",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "95e8de45caa3fa366006e245c0681d4c15ae24fb",
+   "47aaeb0646de93bcd665c3e8ac55a89d5a78c012",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "f742f21d8f06fefe355331893b584ca9af0e2e04",
+   "1e3252924feecea420e152bbb7366d62fa031fc5",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "0cfc6ecefb68db081110f9c9b9b1739b2c4749bc",
+   "e09bacfa6fd4d75aac18a8a2a4f27b8261ccf484",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "be708f879eacd9a2414d628ffdc60e4d7f866e3d",
+   "ec641955cab30df8645164e30f9c33cf54c52ad6",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "645c7f0bb98e36d922cda8904fbe96a3eece8dde",
+   "298ed876f0ab46a3e8844a80914e69d940de2420",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e46169ce4bc102f00bedc5351618c33bdbe5f1ef",
+   "c80d5bfd08072fc04e3345268b9254637c9f741d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "a419537cd5034b078938e84ae535cd7f59ab6759",
+   "33451710956896b1a2d7111680b6c408b4bfba12",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "c9b86740595b49c5d4e30a390b7121fcb01c2645",
+   "c444cb95402a7a5a85386943cf255fc4d5e0c3df",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "f68e12df619b932e5ad7b4db2591bde69b725f97",
+   "8d06c867b75f9f578314c5589a0e5726dfb2fe9f",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "7f8c3fba5d2f70e81b10bac6d8c5e0e3683172bb",
+   "6b4d7aaf3d0a8a53025f314601efdff4353871d3",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "fe517279177c22b9479105e7244337d63e022f75",
+   "02f1cec108addf48a5d5c9559cd78be1fdc541ac",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "e4e1599e76c76c9f039613bee0771f25e871f62f",
+   "3ab475dd62f5e044fa49b8783c5596283ddfe3a1",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "bdc96d0383f75a75048d93cbc618d52b6fa323c8",
+   "180cf23b63f086ef455b7cef74122d507e6e460a",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "58cdf01e3adfc0756f00c644e6f12772dec16c2d",
+   "fb63204561f0cec851fc1bf1e3ab441ad5f358ba",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "cd10a5c9fe8134078db2f4bdfb82c8943c4d8902",
+   "856c6e24e13abad4dc2522d208e29e7e74669932",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "dce6ced3f82aeea734ee112b4b27024502fc4201",
+   "96ac4f9de15e784b4d8143c753a3f81d49c361c4",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "16df4a1a94590da50f49515bd4bc0f79bf90909a",
+   "1fdff5963da31722727d5c3bf07ce9a376b552d3",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "0f99427b67224ebe0f98d9b13584e2bf764c0f2d",
+   "05c28a5475dda06425d39f1307f14dff44192751",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "e53f5b4206898aaf6e5b0a592c4850fd08dcf6ce",
+   "c60ecc104a842fab7f4312da88766fc70499cb2d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "08978a33c3f3c1c1e32517abccc6cb7bfbe30a02",
+   "8d81edd0440690e8d5b47a02aac657506dae6e9a",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "316011bef1973bda80319bc58b51d033cc08fd73",
+   "a5a728cf86bbe8e08fe25d7e80490a6c00b5c063",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "410956b9fe4d48af5b76ced6f8064bfecc039668",
+   "df4f87235d0a254751d783d2c94468903aae27c8",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "0318305cd2d9dc80ecb7048e27fff38042522669",
+   "ec0a21e2db1347f1193675ee6b441351f7b35663",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "a5a1cc939dbbf179096e37d8cfd5ac83c253d5d1",
+   "6255a8d29cfb3c1c9a73b1e3afe03bd9e62a969d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "751da7c02a52f7b0a3c75a81466593e6f9d618ed",
+   "b878f3839f2423e6e9461eef3ecfff98c4364dc3",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "56fa33cde335f7ff0a53e2541f76913cc4efacf1",
+   "2ce35a6ee3cc31d1ba5d3f92d6ef152199ef272f",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "eebb7a97223a7e7247392ee7a0df3d4deeef7c7c",
+   "bde8e0f0d13852746fb3e66031865fa1012067a0",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "ed3608e5d243442c20723604610e173a4464733c",
+   "6b5ea62e345c491b93794a23620679a437cdd53a",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "483edb332084a4abfd14884eba39f5ec8d8d4a9b",
+   "b39c40d1698f15538b3d1be65d230181d2edcd1d",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "ddb4d1a41e3be12bef9880150bc2c757a3fd9e63",
+   "ba4fe78409f3d99a4573ac34c4f02270c3ce853f",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "c30a50e18953162a0a8cbe89f867f2f0268914e1",
+   "9b6574020c65557f1fd3d43882409e824975ca69",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "90ea10806142d7c9ee04bd669d7b2d6a9b42b681",
+   "544426d28c6ac3105b01b5426b9c6ef4bf4ef0a2",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "ce4d4606e11d8967051e80b7366b8f3c078b6f18",
+   "833d0f69136307fea2190ac10ad701409fa8f5b3",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "7c92e52d2bdcbc1b961d220272d7ff9ca3c3e7ec",
+   "55709bb0db26860b979631cdab9faafe66beaa76",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "7ad39cfa2aabe20761f28ef7ad64797597367774",
+   "a4919c0f7dc086fb9899787d3dba55ca14d720a8",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "f62c5d870aeebc56e4eb608191d50a8070506ae5",
+   "9da55918ae3840f81eefc6b14606257fea9f925e",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "517734843cc10a7bf6f840f9931982be7a42ef79",
+   "9884fb1f072f4b750524f93d7bb6d0c1ca60c875",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "6d14ffa076813b957d288bb68b66e4369b4dbdb9",
+   "01179a3fab96518fdddda0d4b42f336658874950",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "ca7c37392e7a88c9be540c49e095f24d99098204",
+   "5a27c133476c8140e5aa5c972821e28665c52588",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "e5c3b9b584e2a3361c78f31a1b09c9c5589fcb45",
+   "915801c177d81b35da87ed448c21aa19e4a45633",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "a80f646780ed9abe37b245bd72dcfd4071adcbd1",
+   "504092c875fe6d3f56866192eadf86bfae8a0162",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "3a08e3fdebea7f90ebc34d97a149b39e7d37c3de",
+   "f128c96d648357100d43c1a7b9c054957b73e162",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "99cdbf23fc668de4247df5f5fbd6961766517213",
+   "9ffd13b1c9fe713ae6c1d78a65ac3b369e4cd42e",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e6b82d9a47dc4e66e255053f3ff0009ab8be6e75",
+   "c3bc40e34b88bb5a2f5fb9c3e20137554b21aa83",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "518d9246bd07376c439c3d65d1789437f20d3ed0",
+   "5072cbcf152f74bc9fee63a69c514d1d984987c3",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "160591e92868f16f620f6f4b4aeb786770d5ff31",
+   "6941a3a73a35a8380b5d738588f84a7172ac51bd",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "b7e66752c39903a16f16205c975d61cfb4dd92fd",
+   "cf296add12bf0872948c65bd8042cd1e74869100",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "636b3dc83801840a2d8d5fbdbf260b9111d793e3",
+   "6219c76898f622203fdf7fc04d40604abf7c00ba",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "679cfe519de5d18b3bb40ec3c501ab5512560a0e",
+   "3a2ea609daa8894fbe11be08d2910164e887c529",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "dd4fed694768295c410903bd24d6a73d1cd5c051",
+   "c9bd5781db9f45f53ce9c002cdf5d293f37de768",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "41268757bc886588945b2f41c510a9270ae13a0b",
+   "28239d6b595a0643335a5b18e068c8314e30e401",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "c18b2c4445df6b6a92a847e214d79562e046fec5",
+   "cabb0193e6dfc7c6018e66a617d07abcf7226dff",
    "testharness"
   ],
   "referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "6e6c3fa217e49e3263dcfce4e004e32cb623cbed",
+   "22147bafb08d6de30e1ca858ff0a5d2dbc8a43cb",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "23954df4320138e4a19bb04f4999f7d2c1224c99",
+   "630393ca7b7c8d068bc663f5d02a320feb5e1f2b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "3669e9b1566abd7cce77e62352d313287acf328a",
+   "660496841a4b67db9d6ebab4879128461e3d0b82",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "80e254d9365ea9d2486c5a66d32b88652039e2ca",
+   "3f0455561a7cc68805855a198a064c113d7e34cd",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "17b30ec2ccf98e7797c7e80de7910c5ec6275de6",
+   "58a3e67dfb7d773ce133f037a987cc1194bc80b8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "ff598293c779fa172e8f54482ee85ac06759d5a4",
+   "fe7d67eac06ea36525e7b2d7d28a3253964a1ae2",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "2ed99daf6f9c0106fb3cacac70d5e8621d46f07a",
+   "94d9aa008c80313c6e71a26715f3c932c931360e",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "823b59775c9bd06c8990b08c3f0ea0380978d62d",
+   "5b7d1de44cc3a09201e37e345f71499302d6179d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "511d41f94470b500a8b517a4ce6486fac2de6ff9",
+   "8b6ac65947caa0fe6b143aa42884d523f28dacff",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "e63fa654aa4fbfe41326b06241cc4a8a2ec2ba62",
+   "2f6692c42930b568c7862dd5535c0832d0bb2e0a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "ec1bb58ad0560a60590e91b0bcede6d91904b116",
+   "93e56189dfb6af99d27a33ee75ddf8bdcdfd3a80",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "2c39f3fd93ab4049ba3c78f65a3abba46d3c292d",
+   "baf2fe784407fb8e1f32fefc8735b0a90ae77367",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "189a82c85aa0033b0ceb029f9893a945b40e7a98",
+   "0736088aa841d21dc4a27dae62260332ed9b208c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "f87ad3a5d324607925592adcc0dcb3b0687e0643",
+   "e6de3ee6078627f082db8f720bd4ba880215d5ae",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "34438f354b269de652e08a15ceca1cca261a8969",
+   "eb27059a957ff35608a8adda4a3c44bf4c6e877b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "eba9addd89108d25aeb06237ef87f75ae8b37b96",
+   "eb1c0191a3bee7f8397e35181eda73fece70459b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "173c64955770d2c22b1b5fa492fac48038f15f5f",
+   "9d006903a0ecb7eb4f64fb4444e84241e5a60525",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "bfe6a69006f44e941beb6ffc9d92f14f5df8610d",
+   "911649a5d14a91e50d73446f93ecd407fca79642",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "df7a1dd44634ce7bbd4a0fd0974bd553c8378a9c",
+   "27cb0340e0f7a640871797ad23916bd752c48050",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "bed99339a37c215bb3f722996201df455e835779",
+   "08c297eae3be1e54e4a4801bdbfb12d5e7475a22",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "ffb89bdf1ccd2c87ec332fe3f98bd282437420ea",
+   "3b72cc842c99c49b59fe0c0abafea1a90205120c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "3c22697590f223c60fb607f105e5d42b0df2c4dd",
+   "89532a53691ecf311dc1d91e4ec95b02f92d9932",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "dc8ac21f0abea67541e471cd3b50ddbcb2e09886",
+   "959d00137c02d62fe2b295b9b3a24ddabcf94c6b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "4166504179a8e4e6c9968a4744668f323c5974ce",
+   "7ba2e047912035f0455dda6e854cbf40befb131f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "012935077481d412f1c2be9f7c21e6c40a538f08",
+   "8b215bc8f4ccea682e8f4e426c5561287ee3dd67",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "f9aff9a3e9fde371ed726e2bca617cc448d6070d",
+   "4c4ea0c52d51fd6475a72bf8738511f33ba84883",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "ae3c99d79a52ebbb8002e1cfdec84a2355186a59",
+   "3ae29a17caa29bc0f0721070b752ceb9948df04c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "c4bbb04f499198622ce63caa1950f17029200674",
+   "e47bca42c765f858671353650023afdf9ce763fc",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "05d016aa8e1eee0724bcb4d2419a8ad69e46be07",
+   "c6421476aef9df2ee76315bcf69306a3f3e3e65f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "06874952d0b9cef3cbe3b9a90365d7ef400a2672",
+   "77c266d21e2f8c408b265f0ca819f0bb4ca2e11a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "633bca5dd9b69593e0d387945e858fa486f798f6",
+   "511058ccf50700159c9f8c9dee4c2f5e422aab1d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "1a6e774a450a9019a77905f648904502be3f60d7",
+   "ffc0a2ee559cb7d488c14608a436be1a9f7447ff",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "51f4051dffc5308838b5151509ee5fae304f1ff1",
+   "8ede638ebbf1cacb90e222cdd97da87aed440888",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "04fb16a1be3f96802614175cbfbe2c75334cc76b",
+   "288fa038a4f41cd64567fb356a3cb88aa52f3f35",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "320062ffd095aa3519d8ec311e989a45ffe5fbe0",
+   "f8e8509b8c8494df8be4797eedf2277f624c39ae",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "3de3c060a97813ece9125c254acfa75841fed099",
+   "88ab886b2338d25ee790434fc25d8be68e13cbf8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "910791a8f7e68ab8bb3745025860eca2ad0a1f1d",
+   "f2482c3b3aebd55a69780f16a29899df697ec6ff",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "64295c74134bebca300c344386c136b7c77ce51e",
+   "24ab142cfd7c61ad1dde43544e04c3ba83d1b614",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "5d96c06a329490d8eae0ce4d7b5a9670e26dac4c",
+   "91d8a23ea5ea8eac7ddbd8e7e17055b761ad6a3d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "4452586c19026a27bc5a6a2b0a375f053f361cfe",
+   "d486a7b8569bf5597aea470d5ec0a88507ad5f4f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "35673291ad7aaf5490e2ab1a290b7f3db9fd930e",
+   "bac54212f090b41c7e5c042137d5483eead4eace",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "a1e5411471252eddd8cd544e41030ae752765009",
+   "fe1ec67414d5148d1fdc4578132624ec4e79be3a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
@@ -696394,7 +696964,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "08962578590b26dd40221443d867f05722b515b1",
+   "3d02acfc5f965feb153a82fbc297dc84052b4cf2",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696402,7 +696972,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "cffde877e101f8abd4cc181baac267bcdcfab2b1",
+   "4fc0a20ca2a1bfa62211d62852d71881c55fa722",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers": [
@@ -696410,7 +696980,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "96e1557063d71202e474e8e00555203ab8d068ea",
+   "46ca3525e6665b0c3c37e4d39b2ab8d9d740257b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696418,7 +696988,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "b10f9c0f5c43dd7964cb7414481aec33de43760e",
+   "6367857969a0c773b63f0d9555d66a63415870ac",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696426,7 +696996,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "44f635102c1ee4eae7576a52f27011bf11934d8e",
+   "dc266208a242be3366cd41be4236b927dbc10db5",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers": [
@@ -696434,7 +697004,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "c15d5403d181536276af3f8a0d83ccade764ea9b",
+   "ae9a1a24c9619592e63a71e30e2f0a27c9e14315",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696442,7 +697012,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "1f56ff4ec9cdd641f35472c501a4cbf3d5674861",
+   "3b0e4d177d76816be788e6fbe5c447987ab8a241",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696450,7 +697020,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "98121e02780678e8f5feb856dd514742178dce56",
+   "fd2db5728fc8048f36507acb037af177264de0b9",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers": [
@@ -696458,7 +697028,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "5c8725b21acc89a4de393ecd697e73e06e9e2c34",
+   "b900db726c214f9e07eb4023333e3c0bc079afd3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696466,7 +697036,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "cc796d1d10fe0a41e769b88cbdf80287343c0a69",
+   "62acabf41c5db52f9547df86f990a382d629d0ef",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696474,7 +697044,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "6fdf28dab6a8162035ee4d28ffb97f496627e56f",
+   "ba056619102a28b940c886ae119af906e5ddd2b0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers": [
@@ -696482,7 +697052,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "95ca50ec9d56c356e2206c09905715b01991bc95",
+   "d86a85b208d772c930913255c55a062df6ae4038",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696490,7 +697060,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "d1e4ec5e5a5dd3ecf3cdc6b325f4d2612f9ed32c",
+   "a5940fd6d948771ac864b1c496108bc6a7b95856",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696498,7 +697068,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "9ae77fc8525d27748031cdb08866ff749ff0ab66",
+   "e53a0ed387abdc55c4b6f67a3b9d3d5dd23f32af",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers": [
@@ -696506,7 +697076,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "5afe2786920cf1e78822fb60b2246046cdb88405",
+   "ebba94e987dca47e7640d1e1dfaadcd0c84b5205",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696514,7 +697084,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "80ac216ce53bc3e2cc1aa5a86868d04ead8c1587",
+   "d36ac614868ed5876dfd83d7d7f1baded7be7593",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
@@ -696522,7 +697092,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "f978eee6e138392a2d997e8b617d552e942a2e03",
+   "8ddd158183954939e926761a72a6cdbf14de5602",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696530,7 +697100,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "48021931887a524b02d837c5f8eeb6f33fb728eb",
+   "3740814c4419d8b219acce92103bb2bac262db00",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers": [
@@ -696538,7 +697108,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "d1a6470f4f51a3eab42d6db9e8764402ea58410f",
+   "461c255ec906b0acc01acdf11fc1655228512193",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696546,7 +697116,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "dc816247653da30286108b76c865cde22640ab3d",
+   "f8cecd0d79184464fe81c88b604815601477ea94",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696554,7 +697124,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "2d9914b0cc0c7635c4800c2001341e2e5cff6d38",
+   "e1b46f72b9db5b9af8a42b45084c18d14e68a3ec",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers": [
@@ -696562,7 +697132,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "fbffbb363150f430e1c3d541bdfa3305ad1aca11",
+   "010656cfb05464a5cf92b6e81e3aab8da37ca910",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696570,7 +697140,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "7d5176b31d3e77712e3300a097edd0f9b65315cf",
+   "0feafdce56ef60e3ed92f78379b6a20d81de29a1",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696578,7 +697148,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "3535e470e3b7a05496614898f90fd8df6b1e2b1e",
+   "a72089286fb826bf64b2622527dd299c251577d8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers": [
@@ -696586,7 +697156,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "c005cdb21ad03bee8a15e3032dfa72549d83bc10",
+   "db33032990969b2ca2c98ab946ebc8294b75fde1",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696594,7 +697164,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "92d5ad04dfc41c66146ce01532e1663ec2640b51",
+   "47e98f19d009e7d71ea1bb2b5e14c845d20716f8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696602,7 +697172,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "80c2dc96234eb52bfeea3403bf434aa6ee1325d8",
+   "ddf8b522b59c69eb555051dacb2ab247634ea273",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers": [
@@ -696610,7 +697180,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "43956fb27738a9056652ee1581a3dfbf8a9415e5",
+   "17f72f727026c968018ee8b5f0dfb788ef67a910",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696618,7 +697188,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "b78a54bdec2a6d1c2c267c6731231398cd603d95",
+   "4dbd0d1e8c51f8094d85b289d499d734e76743f3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -696626,7 +697196,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "5f75d954708bf4ad4d69cc21d03b1963e5098566",
+   "01b339b41d22f5bc6a951aa5fd8aff63b4255000",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers": [
@@ -696634,7 +697204,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "972f53c499d7e61853e82c7d38469604fcf0e74b",
+   "07a972315fc2b7a78fdd005996aa667fb5fc0b10",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -696642,7 +697212,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "2ed48c76b5918584d20da26e6a2408a4a0e572b6",
+   "f4db0be0e50a3e66d7eadb2b1eaeff2fa1072509",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696650,7 +697220,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "fc7ce513774e148c9770c7a06331c39f86282fde",
+   "befe72d96952d108419428bccef26144744e38ed",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696658,7 +697228,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "73c74711d7483765e6a01bfb2e20de95466edeb8",
+   "b2eca76078f98d48815263a0fa1ac8002cf8d7ea",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696666,7 +697236,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "2c20f0678cde0c25486700cebd892f9daf515bc1",
+   "50768c30cf4808e62feca3447ff7fff25ce26d9a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696674,7 +697244,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "36dea90ccd98565c27b2270f8b7971e13fc7ec94",
+   "8fae2caef61c064bbe211e5c7bf25e4ac7f5bf32",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696682,7 +697252,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "6aaf6bcc35507ebe3318ae1ce00db5116e229eee",
+   "4a41087b0957293569d7b5b9b22333a762b1c112",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696690,7 +697260,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "b0a83b027e5442dc518dff9a6ca6dc3440e0f24b",
+   "b6a898c1ad2ba01d8d65ce22c70cc98792d716c8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696698,7 +697268,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "c4b5d2dc307573c858818a4f88433a93c144e07e",
+   "a26f0dd202efa7f762250a60aade5a834c4fff0b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696706,7 +697276,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "cbde3dc348e19684e4dc6381824bc4e5bb59a3e7",
+   "8b178d9990ce8e354d481ce53a0f259b58495655",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696714,7 +697284,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "17a49b5e9a0b13242279606b4151edda5e6a11c6",
+   "0a46c97106b3bea9148faeb0cfa22a53b287519d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696722,7 +697292,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "d8d63426e6378c83af15382669a679c7e88551c9",
+   "cc92566b86d5c51a99cdb88d2b2befe7b942391f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696730,7 +697300,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "021cde83cf53376b1bc1bac5da03d9e06b7fba6d",
+   "9992788652176c505f9d33ccfd9df07dedeb8b2e",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696738,7 +697308,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "55d1153b4eb1227ab1c50d6263b2b3e90ff73777",
+   "a7d6c72f08caa74b81527baf1c6b359ff39674f0",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696746,7 +697316,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "cef8c446d0d4d64eea7624113a2566b7a45d6bce",
+   "c4df370a7176dc44b2a7df8368ffac6a37554ce1",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696754,7 +697324,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "0b5e66191bfc6c1820771989a17a764b234baf50",
+   "8c45a5dac2060916108e47d34681482e482b60bc",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696762,7 +697332,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "085e7f94dc652280daf34fb6e07f6438dc371b52",
+   "bd13da2a29235068d2a7c78762e9d951876f82e5",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696770,7 +697340,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "93e882f38f805f90ad3d5c7899b7a8707fc9584e",
+   "3c53fa01167f51f8d848eeb95f236c6fef48b190",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696778,7 +697348,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "d8f37e50d29f60b787b20f981cd07d8447ece05b",
+   "ec3e284c3c517e5ac679d5539280f36730a1a197",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696786,7 +697356,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "942d1e58614384611e3ce1bffb5816a91ad17f50",
+   "e6854db2f3d460c70803dff7cdf8b2fc314e0e59",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696794,7 +697364,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "3e897a0df32257cb09aac0098367496ee58b2a09",
+   "526c2648432649ddeeb9243c95075f21d65432a7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696802,7 +697372,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "309a08d9c1d692b7cd1c9d83801b04dfa75e193e",
+   "bbf21e785f331cbc60fc74d90b297f9cce2b2bab",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -696810,7 +697380,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3c551d85fc8f8cbf680607f41441931d33b03a8d",
+   "9cef48221ac71c385e94da70662eb003a1ade758",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696818,7 +697388,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "c260249ec349bc488749b9e36bce8b90f5789a46",
+   "e9125ad06822298506b35dda16d51f1273c3d03f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -696826,7 +697396,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "60237386565bf52a82ffe565a130ba603e57c2ae",
+   "4b59071d48b6106bea107ff835c621979b9b174a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -696834,7 +697404,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html": [
-   "9e261a6bd391a8d689ff4f59ade9857cb632226e",
+   "0a8ce7cfe019b0a69c6579718a093714d7da2d36",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -696842,7 +697412,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3e787e57045b40fb785d592a364ca7e025c688df",
+   "09f21bf5294019cf3c28527510a8ece967342884",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696850,7 +697420,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "e9e7be04b644d3e9278339be4e5832b0fead79e5",
+   "53229010cfde7ae29820198175f51b16f7cf256d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -696858,7 +697428,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "4e950e8fec5576b1fa7eca8fc9ef46ec0d860d39",
+   "6a53bb812b332c38ed91bb8264c7d7ca31dc5bff",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -696866,7 +697436,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3141c6301946a57758a80442f99ec6824357386f",
+   "dd27004c1c42d367f53a6dafba279783ee1f501e",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696874,7 +697444,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "88c7a890ba43f1be7b55818c46f9010f19d5b196",
+   "131c0e0893acb016b8e75d3fe7c490155b025466",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -696882,7 +697452,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "e12c0aaac755b501b041c19fda951ced84637c1e",
+   "61753d6188a4d09c602317a0bc85904fdd300b10",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -696890,7 +697460,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "2e21ae4dd559e254a6eb1eabc75ce42a54f196b3",
+   "e3cd061000348e114d4d99604588ceba4688a7f6",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696898,7 +697468,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "35d0b6ddcb49c743abb29b4d3400dcd99c098b09",
+   "6c8a0fd643d07b393a2006b91d6ad07cc8f7eeda",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -696906,7 +697476,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "d5b58f05de2b7b4f144b63868b912973586ab176",
+   "5c6d59f53ec20186ecfd41f7a201254a7a25c956",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -696914,7 +697484,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "c98d80d76e4b723fd17e4420d03652805feb8b21",
+   "4ccf6b24c826e16fd777a7be85daab905e167c59",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696922,7 +697492,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "0df0cb032c3aa8fa34502a63f660361b4ac19d35",
+   "07887aa6a61e8cd3d3dde5eed460706747b56515",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html.headers": [
@@ -696930,7 +697500,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html": [
-   "a77d5f4093e6dc42ee08ec04fba739b97a750c04",
+   "a226cfc9422b2c890dbfbf45fac61a77bb71365b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html.headers": [
@@ -696938,7 +697508,7 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "a85b2278ada78501416f4b85021449960a61eac9",
+   "9d2cb261d6ed481802a79c763a93d2afc76c9712",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -696946,447 +697516,447 @@
    "support"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "c744a58972bbea32dbefc512acf00d2b4f63cf74",
+   "7d128a216ef75637832ff7a396834471efc5c417",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "212ab9cbf2e5093044c46c8c1b2d728fc788c636",
+   "f95a61709ba79dd1cc02cab834ac3092edd9dd6f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "f222c73ba3575284280408170663d637a7acc8b8",
+   "e5c4a5b9d708b5decf2d34476e72881c005da9ef",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "48e45cf0bd30d333220af710e077045c63391ac1",
+   "6b69d4f3399ad85f1a31c390e85b9f2300e3de89",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "aecad6912fedc5e02527402154f37916d8d070a9",
+   "b36d8e43696277d3b94a225c0e68c4cd71dbbb8a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "f32b57b461840b81951eb04ab8d475ec499c7a3d",
+   "cb22d1880e1df36b66793c9609619218891bd98e",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "1511e2698b07ffe222153e897fb965e644215572",
+   "10c4f95342800956f51ce42a808cc88460b738e7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "16663cef1996ea23a757a48be397dbdb4d9a431e",
+   "f93f8399ef7a63d1bf2bccac4c1c425381ffb94f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "03a416fef880d6f223755350047ebcda030f5a6b",
+   "ef7dfd49fe4b8a0ed379cc1b8818d482c8d81b1a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "93359f78a7b72e461e0fc4d5b2263c68f5198fea",
+   "6335b58a250d6dd753fdff0d1d726914a2053deb",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "9c13229902e7b80ec99b8324df05b9c2779037a2",
+   "9087f457aa760306ec583d5d568300702f09e172",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "91d2de7e66db9ceccd6e6b51dcbcda53eb4ed0f3",
+   "cfbb2478acdd5678c931dcbc45b6359264838696",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "75db963a5e11dd8d56ae925bc037eab85e112db6",
+   "562bc513b1b6f802f25a8e73da60965bec0043d3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "fc37bed2d676b616e5b3dbfc0438d4fa233c3694",
+   "2aa2cdd9b4cd11bf00787f6ac781359e467ce365",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "aee2ea7c9d00a3683370b46f904c7b3cabf8e303",
+   "92b2a2069cfa6916881dcf35d434da9a6b0e4c70",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "e7e8c62d18fae57396b6f9c5c65c05e28a6668f8",
+   "9703cae9306952a4139e94e8975725fd136e8b42",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "c08627c88bf7e3b5a91e1734cce110a5a542011a",
+   "bfae1b4ce35cd823606a7f5fc14fc0112a53b8b7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "61fe98cc34f6f45e1c2c2b0170f586ff2fab2e79",
+   "8f5342fc17a5766ddb7b91d012b4f50a5461be97",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "5a3ac9cad35c9be500f0795ac79d8e297ccfdf57",
+   "c4f1a54f2c66550b87da3b40f5c8f7d791c93c54",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "751fe6f733f0f08ee034e266e62616e1aaf95229",
+   "1b961e3dfb4979d4a5d6f9f4e03a9740f9c5062c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "2aeead25c70bb9db3ef8c6b6ea75e4ba576302dd",
+   "137aa7e3af898e5f6d84cea5ad871ebe5409f3ab",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "b58bb94275ef8bdad59a1e8eb4bf8cc0693f544e",
+   "1703a958e784b6839a74a274b8f8352c822a095d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "5b615aa638d53142c9cbd06ab99d5d18cb1699a7",
+   "c3c98c4d4409583cc8de4acc1b64b9f82ead18c4",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "f258c7d56b52478398e19a8c40a96c7dac45dc86",
+   "3d8e32017d195ab4252b2507943a4fa8cc006b09",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "2847f7f7bd0325da0d82b7f0bbd2850b287054bd",
+   "9fa4ca3c127760d4889756e89839e65ae0a66d34",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "89e14deaf8de6f89e1d80d15b7730ceac2045396",
+   "feec6a71fff2d37100ce6a907cd9ad38cfa5cb12",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "58b523432620682735ad69a74c7483c21e071133",
+   "c1c349086bc4b26c482ff27705c1c17090ccb88a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "8a38f96285853c5aa5705a3eb218ed74b4b68223",
+   "a796ddbddc449d2e8b480598303458110fb1456d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "3657c99b0603b106b88b96720dab75f5b5f3418c",
+   "cd2d7972f0d9a9cb7c62086b517a3f287effaf4a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "929eee92da6cab8d1e559eb4ac5ed0ee9ca57ce1",
+   "592768a121ef135ad5e6f533bbd50d961311ede6",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "facb2bb4f5edda5494e2190255846fd019d3ceb1",
+   "7824367f87b613e9deafd127f6f41b830b68a029",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "32139a7e67c11a45fb2d367ecf5fc426796096ff",
+   "7f07485e08e69aaf2ef8ad584182c1431f0b1e5d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "7c4fa4c0f8a4e1f88d38bfb2685d21408ac7a158",
+   "c9d64acd3ff519673914c0a921d1d4c6730d4ab4",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "c9d040eba31355233361b6f7328de63decbe14c6",
+   "8d8aa7b1407caba05ace8055ccabf0e59f830d8c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "8aceb49eedcc90b9b36cf98f97371393bf20fd4e",
+   "585c54a5b78d7cacc85dbf2dfda0f22b2847d463",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "e81c2dd3f9f311eaf05bd85715864a2447dfb6f1",
+   "53e908467c899a2ec44bcd649503d44aabe27e35",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "70c3f7425ff2346440bb51bc79ea457227312c76",
+   "48e6c69b5557c4d0a2dc359f9562c81bc2d98c2a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "f44dc59e66f85f59f3d15e1e698869d8c164e5ef",
+   "aa3dda32d62afe6a5997b80d5bf3b76dd920272c",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "ddc2046916efdaed118b2bb43e2125075eb072f6",
+   "d319c671e1fff162309345b0c32066dd1c4cfb01",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "85d8099abc515e325e4be5f78b8c3e865e5cb0b2",
+   "2986e09860fd2ee0b6847efbf483c4ebc2a3b2fb",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "6debb95cb570eeb430c2338e29f7a105e950407c",
+   "b44acdd3f3bd62b513b1d41267e2810476ec65db",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "1a4487f292a13e3b952e9c184cd152f185e512a2",
+   "da358ee0e1c90cda547d6e25bf2c4858db18ef29",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "19e07a141909c0e9c42dea63c5e60975c4fe9e83",
+   "2127ef3ada6999f1e1c1ff5964b1ea661d13debc",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "adc00249ccc392399829b3f2a5cfc2882ce33ced",
+   "cfb23ead04437265b61cb4531c929991ee3bb18d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "cf3252420e04ce4e9d3b928c36f0172e7548e631",
+   "57db10fef105cd14ec0f6c74204533c328c0c6c7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "fcc357a289a2a4cec7fd88399780270746ec9e5a",
+   "e854d09454f1061c079a867cdf0080d0f3b310c5",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "d74ebe4a8a6875384b1817bba6ed1c269fcebd0e",
+   "58993fbddb9315fcbae4d9fece540842cfb13a41",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "47dd5a3b7ee394b5581954aa5c4586f5f70733bc",
+   "58588cbd89f1704af989f296d4db656b89d59ed8",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "8472b004cb3bbc0f351dc442792d5c6ad0c4b75d",
+   "57abce25ec01003afeb22eba5ede3f4a032d638f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "7d7df4db6eca2d4643fb8f74a250bf7f134abe3b",
+   "73a9963f1f09c29be39e2c87f0a96dd048345d85",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "e2ee48a6b5f24995a8baa2af3b0eade510a34ad9",
+   "e5d89fb2d20b92c6fd79920fad9db36a3425361b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "ad37935f0eded2c88735cb032f188b810954357c",
+   "f69d366a327ce38af4e4f6bf5f6050228e1495d4",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "767fc96eaccbea3393fb3e309863a8c31b9c5025",
+   "ee0f051f770363169c67cc362fb06f0f12975384",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "9b27e8aa0d83fa20828b6393fa6c91ae50e786f7",
+   "ec455a6aef7bb4ec4f970dd477a3abce74ba7728",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html": [
-   "a3890c90eaedecfd0e676e2fc5e0d7ce4134ad87",
+   "a709e40c51bed38738d5fe4546688fd20095464d",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "71f4f82d1955d90e837b9716f77808a36094403b",
+   "dc2c9d9ab75d5f7ea01e0fdcecf02fe257e76ac6",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html": [
-   "025d2fe085aa8cd2c0f74f248ec750357bbcf98d",
+   "9fbc08e5384510b7587629e3afe6e061d1a7e485",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "c9d646512956cd3c2932911d07241ef6c913db24",
+   "3f46fabe37b2e5c7f79a95f5f522c5c7f1e0373b",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "a549857a4dc90feffd6eebc00b9a4b63c17b938e",
+   "3ca5a0b0d7cfd6570b759509eeed04f66f306941",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html": [
-   "99797a3cfcbc7d18e1dcdbc2759701c181b3a03a",
+   "a17b3ba8c1737d21cd340e91425d2cb8f8cf4ff5",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "0c266d63d475d3a0c9a36e3c79e58b677cfa9fb7",
+   "fda77dbd15b820e70807c6ba4c50416b3a3241d9",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "9e66977275f830a60482ef612f1d6a86814c60e4",
+   "140fbb9684b9834702b642c8ccc0f050e68372e6",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html": [
-   "ba464fe3ac6e3450d955b37e04e86b604e868dfe",
+   "be879a223147a9f9824f63665aea3b7614be1516",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "8290ed5189f02df1d59a6a2c290b9f240ff7aba0",
+   "95973ce73085d514495c4faa60c8612de7e15db7",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "1991fd3d3544e3c3cb1144f1dcbfaeebd4b2a1b3",
+   "fb2ae653afe0150e29f9fb7c9c5283732623d66a",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html": [
-   "85286d15a71f5fc92592fd882e9e5040230d33ec",
+   "13669d31a6983b03ce98334f3b59769f00f9666f",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "183f6364f1714c545c56543e545655c3e0b3eeb8",
+   "0f8985d142763e74fbfb7cf227515ccde5825d35",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html": [
-   "81c6a2700df584a7e98aba5e95c2b1ad50fff0e5",
+   "26434dd0a05af0bc88bddecdc28dd5c68c2794d3",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html": [
-   "e85befc20d057c6d371718e2b371f797f762b15c",
+   "62e3849d679f80d7ffd4bf0c8acb2eca2ba90844",
    "testharness"
   ],
   "referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "832ac698a5cc60d2814a86ead512951a1ba3dd72",
+   "6a09e53315ab7fa644b785f3de0f5285aa05fbf2",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "4d59f674b9847f2e870e8602b5d776fbe6b0848a",
+   "ef0836b8e8759325d50c23bcc206b5fe974e2593",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ca81802a256f2ad4ed6f1dc4cb51e05c58d3a73d",
+   "86f6a004c32706f57518b11600e41212876de0c6",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "37d6dbe8b3086d803d3d417ff0f321e0d59692eb",
+   "c404fcf03f9e76a1408f2387b338d9c6335333a7",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "31516d48b3d4d14deb83caa19fc8e2d9b4cdf55c",
+   "f3f701fd230d672c61772c7054201569a1f59173",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "b84f1f575e9997104f764e7cba7cf6243ee3e717",
+   "2ea65da273ee14f51844c0ff2cd82d814e0d9901",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "2daa6a24c58753464e74d72007aa5ccff247d60d",
+   "90a500cfae7b89c2a8541b58e8ce0804d0ab4718",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "bdbab61818d6cae73d8d3b0dffbe6a5b9860f558",
+   "79c96e6f2b418a2bd7b07009a0b7d9270b2d8198",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "0f736f19b6e5bc374eb75c8c55d0d891eb417383",
+   "714a08bc7bd4da9ff1812fd31768613d99df042d",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "bfb5349a641a1ffe97affaa2313874d747b2d9b2",
+   "ff7e409b8d98db62ff9f3c442509d66f0e7919ac",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "08e015bf7857172bc33c707b5a1deb48ff0e5959",
+   "6e914683ee821997b67dee5cc1c0daf52986af15",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "ce605fd5f5edecb55c5980c0ee7d4137438c7242",
+   "1a8ab2b48306295d1b8f3eb87d8dfbc50f0b7358",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "bdd2cd63dc8816cea4f48a049cc0c38a9da33042",
+   "4f8dadde3c41e15e568b9a6321e57b9cdfbdfe76",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "aefce7aae8df705a8854aa679407a97cdc95a26a",
+   "8f130d28a17578f82edb8543e17aa4b045289b8d",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "5dfdefd487f56dea4fae97903873fbdbeab0ff78",
+   "75eadba3d1efa74cdc8c978f997963481e2b59f9",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "4aefa90909485bd08fee8ef357e890f3ee658c4d",
+   "4fe3af9ffd3bb4b077f3c65e7f1f8817cce4685d",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "070cdcd6fe5a572af4402a10a360bb929d3c42a7",
+   "48631e39d2622d7d3e3133314c761790bdc00957",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "8bfbfdded245371b825984166c95c2a6c33d47fc",
+   "3b10e291d3361090bb84e60264154aeccbd17e1d",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "85e9536c51fdeaeca0fdaadd66a45f6a15d3e9db",
+   "bbc4061c2d27c37dc54d6be19a831c6aa86f460e",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "7ff64169d47fea3c28d1f4659c4dbc1d032f896b",
+   "2d2ef35f6812f46c99af481956c3292dc69f12b4",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "9cf165fc9e2e9766115971b690ff42073bc9d7cd",
+   "47c51d9df663b03012695da3516a02e6ab0695c5",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "412dd7319f30d6b4181d43f7d421280b1f82abd2",
+   "330d3f0f907d853eb503531137c7deecf4a05b6f",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "4c8dcb9bb144b69dfb162552726781cf2130fc2e",
+   "ea15eec31891a4328f5cebf1d47df7d42f151a38",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "e5126a170db6507216b950b1a9c788dd71ada415",
+   "61323de7a029a42918dffd54dd6590fcdf4d2d8f",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "0ee559675bb7705d2e699fec0e8726be4668770c",
+   "c59ee9d340c69148e2bdb886d4d52abae1f8f99a",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "14eed644445432fc54951d8e2090bb77e33d4502",
+   "51b9ba265647a4b6dabe21e112721d0dce0ce7e6",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "b07f6b7302aa5abc14259af525e8b9545308b92a",
+   "72e74ac6802a9cf6de29353dcde4dea78c65ddee",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "4ebdb286df0024eb2484e6994645bce06d8d4c02",
+   "39c651732647ee15c47c8f32c7258442bae8370d",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "e17185329b4f88302ee6510bbf1436f5aa60f69c",
+   "9af146296a2a51b9c76b3267c93a89c22f4bc3b1",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "135a4fb22a3f108a76a88ba94c6468e6f1316d30",
+   "4000dd3467dbccd3d31826653b47ad01ff54e37a",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "3a3f291f176de39b9688e53af669c89ebcdf6dff",
+   "547c19ff4852446c7766e2e7229939ad02ba0284",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "b7fadf8e55e2a272f03f327aff1b63a2569d62d1",
+   "ec64d6fff5a3033dbad357fc7b16a377907a0311",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "7ba3045ef0ca86c2929f2b522da9b13973f91248",
+   "2623fe82db01c67d5339d87afb0340e9e5b8af89",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "bb303226b7e68e8dea5d16262010c0409286a4fd",
+   "adce8bdb5693cf9164c801b358c971adf44ae33e",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "578014681156ec5679eb460c0dab314d4748a3c1",
+   "fbfb700eb942f4f81b60865acc65a95b76d24a15",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "6996618954b3c47bba6f4419ad6eae40667e5a43",
+   "68a33b74a18b0d22299f590b925c9485c883b453",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "b73f65da88cfa3de4fb11cad309311432b1c4e0e",
+   "40e7caed48554bee235dd35989bd1f606dbf33d0",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "dfa86e093d8233f2f77f8a7dd874eda9b5b54319",
+   "7992aa6e009b7eae992387bebbdfe9fd04cdbf76",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "d996f1eb49f922fb4b544714efab227e9cf9413f",
+   "9c4011d2817e6fa18ad45b98b4cf60dbe862b48c",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "b7f20cb80a31137d3a7daf253bd1a4358f61fcd5",
+   "b174ef4feca3b4ba3edecdef4b5977f9f81e4783",
    "testharness"
   ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "d358fdb4423bda0aa1d465bde78aa1cda8f128f4",
+   "6d987fbcb5253f051dc4d3e2999a442fcfcfc56a",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "95d57c2b9ce581e13f676688297be995c38db945",
+   "9fa486e6ef1b9cad07b3c8574951a506b77c39a2",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -697394,7 +697964,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "d90b3b8df34dd8b8aead9bcbda28029b719cfc63",
+   "5577dd290e88f325f369e56ebdfe9f1d94db979b",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697402,7 +697972,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "0c84b5e9efc84b5af5a5873d49915134d8d709ca",
+   "3dfd7e3526ccfce8b642ad96cfe65eb256f639dd",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -697410,7 +697980,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "852e16e47d7db0bf7d4394903bd8d3ca3be5ac29",
+   "5fbda64f1dfe568f6c365534940d3e638fc5df6c",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -697418,7 +697988,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "0d265edeb9a93eac3842e3ddb133c8428fb4228b",
+   "b498a7d7a3112feacd4377861ca4d0b16465140b",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697426,7 +697996,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "c2450a514ebe4f7e8cd9a58204c2da00bdeddcf7",
+   "cf30937880f520772ccfc5dcf624f6e5247c426d",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -697434,7 +698004,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "5bc159a13a31436944626f6ec074d584e15fa991",
+   "5123048a9617309152bcd479671d6b6057691daa",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697442,7 +698012,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "c0c2ae7cd905076a650be1d2bc7b6dab2ef7784d",
+   "1a6b871132705b6a9673af3cfec02438df0dce8b",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697450,7 +698020,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "6dd1c69940699f2b3918e88db609fefd70a94aed",
+   "6ecead7d50e338377abab19dd7597cf4fd94e8f5",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -697458,7 +698028,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "7f284d7ab69427b2b00ef9ceb1d9a8c911a2400b",
+   "abaf6d3efb894927db66ffb481db1a11ca61e8ae",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697466,7 +698036,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "cefe89addbc7e9e2ef05704a75701bf70620a777",
+   "849754d0a23a9fb285da2181af2b4fca38aa5788",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697474,7 +698044,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "7e9aadfca7eec6caa479986ddb342d36553fcf36",
+   "c9009ba9bb480c1f5ca896db4e277663e6e0cd15",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -697482,7 +698052,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "3a2025adf470cb0b5b6ba02267f2bb7548041b82",
+   "e10011d34f1c255e8dc1bba44421cbc394ec1c56",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697490,7 +698060,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "9120ee2daa1f7f0476a26b8fd5b35b81717a57dd",
+   "3a8045104ba6f925939ef7dc001be3b1b79e6e23",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697498,7 +698068,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "1897e65d091decb13366fd1bec5dbc803f973f12",
+   "7e4275cad39a8ffd4b786f7170e4f5242f805e01",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -697506,7 +698076,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "05e3c5061e8d47babd27469992ef83b2c26af937",
+   "130958a292a093ff546e19c75c0b31b7e72eb6d2",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -697514,7 +698084,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "9a50c94e13e949ac631754d9ef6305490d91ad4e",
+   "40606039bedef1fe8d51e73c3591c805d9542caa",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -697522,7 +698092,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "c1341fba41530d3737b00361b85930f79f69d85e",
+   "35fa4d4e120634793d85b490079c73d819d91b7c",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697530,7 +698100,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "5a14370027b4824fd6b3e264e16b33ab1d7ce3cb",
+   "8bbdbcaf518e5768d1a5ab0122614e01b19fe355",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -697538,7 +698108,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "b40e78125f47acdc3a9ec47d4673d0b74f0fd190",
+   "f765d8e5ed47caec82d4d7e8e73ea60447830ca8",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -697546,7 +698116,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "9229b712c59ac9937746ae4e16b4894571d4bd51",
+   "81abd80a316168a43017a6ced1704c3fa9737ab9",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697554,7 +698124,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "975bbef9eec4be16b0c20fc0f21d493a06765149",
+   "dce1889cdafd54042b8bbe2ee8992ec69b235351",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -697562,7 +698132,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "200d2581d7f230d8ff12662928bacfd288c88c96",
+   "2d300936294a87e13aec983a5775cc6e5c2d9e3a",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697570,7 +698140,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "c4f86b6f13fa92153878417b85ed650d675c13ec",
+   "7490ce2006c713de56b2901f993ad48465f081e3",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697578,7 +698148,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "e561639229ee2320930e527fd50626b80ae1db8a",
+   "efa72adcc5987f23569853c8539146e856181d2c",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -697586,7 +698156,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "9e05f3169fdff260093fe97ddb22b7ff4d174543",
+   "6c5960010bb00a6757733a52638d402c05e6acc5",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697594,7 +698164,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "6ea52cc0b8a11a289400918583950635385a9b09",
+   "c3f9f1540c819fe7fc7ef246f646e6607f555710",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697602,7 +698172,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "9d7a35e7321e02d0434b0153df17a079f5724fdd",
+   "972258f7c091c7d4f9caefbab141851e47747b35",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -697610,7 +698180,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "eabbc62da39fb1b0486712339f6ec31cc21621f2",
+   "a0b43f146fc6f953ea7236063d57f64a4644d9e7",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697618,7 +698188,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "8d4ae17f4a72cfa9dd652995bce58f7a0ad90127",
+   "e4b8632fdcd82b7ba4bb6478b661edba430a7b08",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697626,7 +698196,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "7abbf86e45cb2707ed95680d6afc3722297d7b30",
+   "f01ce4e02899682af817b4493162e7d967b418fe",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -697634,7 +698204,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "5964582f93a2802d81556c79d29508e79a6f262e",
+   "f0d6a0fd05418ea243b3d310db3dec726cf01866",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -697642,7 +698212,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "d8d232ae484524a557df7d38bd955bf35527d231",
+   "669b174a081ddf8a9a343731ed95a3a0304af16e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -697650,7 +698220,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "23632702001480edc05159ef8c17d0defb0f2a36",
+   "f62fcf98e4074ef6070dbddbdcddbed45915aa11",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697658,7 +698228,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "ae3efa4161958271e7adf84a12df3e761949675b",
+   "c6c6a1e4837c818e2deb39ab4dbae2656ad8102a",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -697666,7 +698236,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "9df73a22f39081a19d8804653e46a02480432e7e",
+   "b74b0d48002ebe35526fdce593f4525d736618e6",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -697674,7 +698244,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "86fcde84c9777a3858eec4baca344c0518827709",
+   "e18a7d6a716ed458b3be0773bb971171513d797a",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697682,7 +698252,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "91a0070961539e616997814f3e7ae0c5efbf8b19",
+   "792f0231e440f4ca26fe0382dab94bbb31e9d86c",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -697690,7 +698260,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "da9e364cc25deb243cbc553c5b02eb138c48032a",
+   "a3d13d7ef6b582c7d5c59807db2b5723ec81969a",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697698,7 +698268,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "0aa29edb30a7a21918cb70a279b183bea839e8c6",
+   "e4dc43e104e21c1b31be2d75f1d59b16d55bbf7e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697706,7 +698276,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "5141185712a7619eae3bdb2008291daf8643848e",
+   "fcc9e44e29c3bb03cd026dd316c58fe74894f368",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -697714,7 +698284,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "866d1e85d9bf3fc9ba5abbed27c2b7b218e983bf",
+   "41d15b0fcde677c901a156c64013492373094f2c",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697722,7 +698292,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "380654d58171422982926ba0816542f243e98214",
+   "8f54379c868928a7880d49226ab03565e9746408",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -697730,7 +698300,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "59db4660452d53b99f33b51b300c40563721f763",
+   "fabac2224ef801303534c71343c2ce48926fccb0",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
@@ -697738,7 +698308,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "aeb58ff3e98a9f31fac2712bf5bdd1b537e92933",
+   "9635d1c76c6aeb0408015d5bdc3c63ebcc18300d",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697746,7 +698316,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "8b487f6c0c73736e61e3f3cfddb9231fe01a39b3",
+   "b825d86ed65e7aa4fb5f7631cc63fa18c70798b5",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -697754,7 +698324,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "0688080d1fafdca9f20695f2442c0f572c939fda",
+   "a8231d341c6681e1378813040cf54d56bb17894f",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697762,7 +698332,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "239684dd2905b47952867820b46a186629ed5950",
+   "ac410b0914267c2844a77dad9a23e46b3eca9ce9",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -697770,7 +698340,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "1e7e81a29da3b11cdae2addd67a0ec72c91194f7",
+   "53d238278673ae2a50331cf93fa3886f1d2c52a2",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
@@ -697778,7 +698348,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "e2fb196189469ea759cc4faf42bd9310cf4ba33f",
+   "35418f29644db9d575656de22c51c7d06309a181",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697786,7 +698356,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "b00cdd18680e0e7cddd032413573d98ba6ef693c",
+   "4d62a43436b8a5de893c3551fd9475eefbc146c4",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
@@ -697794,7 +698364,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "e938e2948a5581ad14bcb2054b33ab27beaa5166",
+   "ae89a6a0880ed3e835b9607555285c472d599aac",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697802,7 +698372,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "4607b2f2904405bea07651396d7272a78f84357b",
+   "06c3b88fb1cf61423063208a8393720eb3a30bdc",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -697810,7 +698380,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "866663bf416ade6ceab2233226464cdc8c71fbaf",
+   "237a5f0f491134bd4144f67d2dba8098b381f4d5",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -697818,7 +698388,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "f692ede758efd57096ef73cb192bf0ef695a997c",
+   "ed249742bfda996c31ee78498720021f586daf60",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -697826,7 +698396,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "6901246fd9deca553ce94a1b05483fdf200fd376",
+   "ec9ed5db2687a59f6adb2f76f6ac0c5ecfe96608",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697834,7 +698404,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "4e80eb02c6401244144dbd450836d1ef7118fea5",
+   "545d5215b80a71b53ace5c2e8c6b974224d1f95e",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -697842,7 +698412,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "3b18bbb823ed05cdee29d41cfe57b7c23dc2ec7c",
+   "0a8b8a98c183667eda8f515bc6b0b83678aebb55",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -697850,7 +698420,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "a3a534244a9d8373ca366811f8886148c7f1e2b6",
+   "a4efc8f4d6b5898f2bee1ed04c462d5798587b01",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697858,7 +698428,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "5953cb46675bd85503983e72bc0be470e2d88bde",
+   "5ff897669a4aa2933728d9d4347ca05de0723d9d",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -697866,7 +698436,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "b42b245873ab61fbf39d69cbca152cfcc317547b",
+   "51d8fd3ede2ac355c977f273055f31333e6e7e67",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697874,7 +698444,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "127050a15152c80767efd2267a23d19359dbccbb",
+   "bf13e92fa48c9a86934fd2b3077b5edb037302c4",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697882,7 +698452,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "89b2084026555fa0f04a997aa9414c606b11ee1c",
+   "d1fddfb6a424464bf3fc032b050c8c9d9dacb4a2",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -697890,7 +698460,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "5d1e2edf7778276fd8a428c3948597739b5e49a0",
+   "cbdc2336adaa8f7825b7e8ca1e0412049a7c237b",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697898,7 +698468,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "ac2de9e9025a1541a743cc1af2fa0828a4e45e9e",
+   "8563ebfd9fe6bb629df2f48057c8bbbf4d09687f",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -697906,7 +698476,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "7be8878c8dc93e029a4e19b22c2a668112064e25",
+   "6365a8bcf02aea26b97739bd0a139f86657fd253",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -697914,7 +698484,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "8a8ea462a79ae61addcec2ab53f6ce969806d2ef",
+   "35002016c5ad9c9b62d740ee3ac99c9a4415ae87",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -697922,7 +698492,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "6d84859d9a6d92375d06631d7ad8928c895c652b",
+   "0f0d047fffaab0a5c33871a07c7cb684c8e2d4f4",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -697930,7 +698500,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "2470adc1294fbeae33fe7b7d76998f1302ab15f2",
+   "4c9cd6fdaa190c73ddcde3affc953ea41b9c432c",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -697938,7 +698508,7 @@
    "support"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "72447eb821453f366864038db326125e87d0f46c",
+   "d9787a4e6d5ec0cc67e6b3ef84400246e3608e7b",
    "testharness"
   ],
   "referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -697946,419 +698516,419 @@
    "support"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "a87507850882b3cab426ad3e91e6c6ead0448ab0",
+   "8a7ede0d2ddabaab705f9bc147e884fff273e98b",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "664289ffa68c0854e4654b594d43189198372cc2",
+   "a150b8ea76d0a10b7adb4ea5d5a4280e2afc2e2b",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "01783b97c697aeb7428750ff1264d7a460e0962f",
+   "e1c0b2a5b5a470f20dcc0232d07be98f1e3d9dc4",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "9cef3616cb7f21bd92092396568e6f3a8d97fa2a",
+   "8dc5fd5aa9a1a0d877f7efc474874386909fa5a5",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "d18562e64c738c4831856981c25168c6c05d85b7",
+   "f74e8d3cbd5cabffb9a9181ffa2db0a0dd5f35f6",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "e0cf6d2d9fbd6b970ffdf6882ee91080149a7327",
+   "71d010128640918729fb3bacb01a29b398e5236d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "bc042eab8b349267cb1e27e3a3eb5dfe420135f6",
+   "c5e42caa8bacf38f0bffff4bd21a125728b1c525",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "a9c87d94ff4cdc8da5733073e51e231edf5a54e4",
+   "1a5ad9592d5fd28fdbfd06bd2067e58b9c6b4fa7",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "71c9c9073587f517e39cee262a0c517fe5cb4b67",
+   "0ada60ada7117218c2211447c60a525bf33f0ca7",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "0ee1eb93da895b49500bb2086947179187d342fa",
+   "1737905526006bffb455575ebfe0e8bec7167529",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "4bd1a03dcc5038b1bc75af2d56e820a2d7fd2bee",
+   "f967363820902b6413b1d531ba3eedc4b535771a",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "2642535512ab8fb97f0cadace7ea9cd554473219",
+   "d4306b793492c681087ecce7dc66609262f3b848",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "06543ec39dba9bdf32c5d29e90c220c01f58eddc",
+   "0b0ff184b64f00f320c265679b6946929826e726",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "242d995189f1eb1360508d4342359d1475376d43",
+   "414c8723ca10488c1a42fade46fd983ed5668180",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "f101b25a2016ee514d43bd56521096d9666e792a",
+   "ba53dcf3508ca479c3a425555c514a261256f4e3",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "07258ac6c72d34feb34cd3732847ff3eb0d21543",
+   "0525b3cd2ee7d33568980d660ad65bce6e54b940",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "43cf88c2f655d77cdb9056bc6ce5d3ad9abd3820",
+   "60094d7f0abe1838bf39a4f720b77f0f94888a21",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "ee2501055443ecfeb2959b444ea04308ca60af5a",
+   "35b705119f71b528687537a3a4a011a1e2c5b257",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "e7518ed3bf89e4b993c03ef3c9d63730f3f3007f",
+   "d5908e7ba783dead9e1cb6d2ece29688574d4a96",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "5d7e052a1d8f7828602e5c5d25d5f97503056e7e",
+   "3be90e5d4ac1efe53fdc105190be8e3b7c2229b3",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "332388ea25c978e4b0584da715a336d636f50552",
+   "d64247c64475a6107dace6ac486ccb70ed81c631",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "428258e2ba63b6942b5f3f6045bbc466fa74a16f",
+   "f9769b95f9f7a92f3030c1c971fb2e2571947ee3",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "a0888ea6f7356b4db79c85ea775bae808a0cbbd7",
+   "7c9b8c83221ceb5e416b6a773d4a19d34fffad06",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "8d63366815afba44e7c904ac5edfbcdc1b2e6e19",
+   "483a43cddb138648c2df46f4eb5ab6586c4b8333",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "eb5e55d20c1a26325c6ee92c3f93a756b1cdfe57",
+   "f27831c876c8aa33b2d56b6b39e5d7ab12c2fe43",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "70611c502d37e5a94e3afa4605ec05d8a9dac596",
+   "44042cd5008283236daf1483253fd8576c3c17f3",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "53d81620f4eda3d73c2adb64b216d2d2637516f7",
+   "2385c83cab9ab56b37f8f5ca2ce8fcfee6ccfe4e",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "41c700bc81f6be24886ed2c3b36ebcde6b4dcd07",
+   "bfe81dde602b875d20403a5be9a34f3120f25dba",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "daa1a3aae85789b163af58c238d6448b367df830",
+   "c4305ba0bc8b52694e6d09047cdc41a9be8dfda2",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "535f3bebccc89cb6fe845bbdfcb0da349a474566",
+   "7d89052f52f3d8408e8fb3df960974d6c04727e5",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "f874efccd74fb39aa1ca0ff5dbe6d20938a339f4",
+   "738ef6b1996f8c28ca7c12c1f350e1c685440394",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "ee647402d00aa5edeedc283b452a7142081a3af7",
+   "f34d5494e7db61d9f3399a55d46f1887eff5a89f",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "a8425d86c3479ebe09f2c74f478491771017b552",
+   "7599f2ff24317f5f4f29cdf28684db78a1cc1553",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "9b427a8afd0833e6acd0a410b2939d1f39d5aa23",
+   "3209281673b8ab56398d663cf91d6fd0b27764ec",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "eef34cc540ad1a37967f7892993a944d3b12869c",
+   "e5d16e24a55b30cd4998f2aa7fde02bcede486ef",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "2a00a0655be6632782142eaecb5fd4c19894cf25",
+   "8009f57b1ee263fc1fc06af5887eb3c216742bbd",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "b7f17b1ae4f74325cbe53fd29c3a44889228aa20",
+   "b702eef57fc14889dea16279430d29635cf1c078",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "30e950dd1aab7e4850e3d61990ecb35ecbb4481b",
+   "b97825de1e0cdb56da1510fd908528c1a553be8c",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "d27633cda9810d5fb6886636bad8c35a8b7d8256",
+   "5c73dd4d88d7ca39041b2bac62e1ec9ab0507258",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "58fbc1ce17bb29c5886dde0082ba24bd61d496ad",
+   "f2a25196f712cc72458b8df5a22878fe6aab7e88",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "f37fc76170e630ec3fc1c2b36fd219b12f731e73",
+   "79c61faa4175c79013ec81332d4916f69b9438a0",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "539679571739e46f7770c6be4df366790bce4143",
+   "3c2117ec0223436fd7fb76000f83ffca1999159c",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "07b34aef6f697fa70b6d2ddf76c99d6a1525a705",
+   "aa9af02fe1e0e1877e0eb31e6bd6647fa3fe0ef7",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "19a4b7dc36a24ac4676e987e17472a869acc4e2e",
+   "43f4147975566dc072fa4bb1a1b9f7ff24817826",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "f841857ace067d5d1baf1d290a7a22fdb5783a66",
+   "cd10ed2b6b59793d3d9af2c6c7d90653d4cf7532",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "39fffb013a1f97d7e2905579f274d2efa4dc711f",
+   "a1538cc41be67998c463f2f32b262fe78045c003",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "3acf7cd000dcf1966c9bef6d99e46ffa627d2302",
+   "4fc2718a910c050e0e204d5b39f00e9b0b1dec0e",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "be3189f760518b63b07fe9b34c591e1d614ed8cc",
+   "2ffaea9826c621a31f380ffdd02b3a8526c4fd84",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "4357b4568a2f758cf332a203d274c563e0545429",
+   "c997e228e17497a2a993792c1398c5a34756a7bd",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "7505361c7165079f2e7df6cc3b86b05436e49558",
+   "2872d59fc514fee21801b670ba49f1ecbfbeae03",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "c61dde7781d10277e0231ac25bbd627d4c111683",
+   "dc7222d37329499858241f58fd3e9a12f656403e",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "c56f4990bb70d1f203b5db5a2fcdc18f37435c48",
+   "a2c953d6e74d7b2b5f7638fe3eb92a13162ef0e9",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "f8c686e48b2e3d73c9cdf0be1168e6bada95bb90",
+   "2bf98b8211904e826060157c789f9f78dfe8d5f9",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "55fdf3837d9c6804bf99445ef562007a0236d450",
+   "0af634a6d27ab6806d3a112646383317ae2e3478",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "98cc61436e00541b188c7c20b0b4092ed42c44f4",
+   "f3608e17eb9e9b4e00e97af35ecb5a2d27b8a68e",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "1110ef082b649709476a20b4a62ee061344fe7b9",
+   "57d8f47d4f2e209aed09cdfd190e16f3f4dc3545",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "00e304fa40fcae0acc58021abf70f958b7cddedc",
+   "47870a7628e68b29653fcad2826a4a4e1f9e2366",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "52103eb8d4148a2b825d342010c97cdd7976a05e",
+   "3d1253229e3ce2a12c25e9a6bfd0ea8c32b4a960",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "85a8aa12f6f25732d29257e79405f90737511def",
+   "8c0a1ec4eb7e1d4e73cc9248b3a5295c6aee2320",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "d69b1f9dbc5b81c77f09739e53b25333bf554c09",
+   "eaf45d6f7a56b805933575a89796fbaee236a10b",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "004a25c297781d732ed7bbeeeb98262e248eb078",
+   "9eaefdaf1ecb6a95d61a5d09b04813b1b4f10209",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "c194a59094db777f1a5b21cdad089427a2bc6d05",
+   "bde05c454fdc270c6c58b9b26d61c96dd12f08cb",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "141da1af782589e545245e6c7c05693693b25c6a",
+   "7d723ab86a122870119fc6e46fbe8d6d64a1992d",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "103b06e923ef85d11f1adfffa0f32b35c5b2ce6d",
+   "e04b8253413a606b5913c532ac9c3934188310cf",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "4fb66f80c3a9863f5420ccffd9060d2e6312c774",
+   "413e8ad82a1eefc6fd671a02db9ee4e52d872552",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "313c1bc368c63880fe6c938899ca04266605ba18",
+   "2832c088422ab0fc6154f4ef695698f0e879c948",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "261516d3ba7cc5785bf603789e02ab4f8fd27706",
+   "78773bd5e7142ff4390bd686aec6cd21755246f6",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "810f1c73cf8dc6ff27d944a37211cdaad7c4e4d4",
+   "3cd75589c30396db88d29dc11cb5abfe0ec7e43c",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "8fa3c37a9c00f48cf5365a960f6b1ac0ddbbb349",
+   "cbccc42abdaa5a33189e9aa071e252e033f0a230",
    "testharness"
   ],
   "referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "93c5d95b99464800052fc0f680177538b24aea3d",
+   "ccd15b3bbfca4b0aae2817432949a042d535c599",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "1441f0415059a55b0bdfa80a2f466e5c16695777",
+   "7bcc2189a06b278e172ef18e25f2eb77a9080976",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "8dfa7ad6b40f25c30fce6c8c8267d27b1f3b16c2",
+   "052a9df8e718bc7f5b1a536b542afeb9e77d2d1f",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "c4d2401e1e2c2896ead8f16723f7892f4890167b",
+   "92b1559f77a34faf3d2e27c3dbc9139bf6ac7594",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "c0ec1c7b35a26d4c561893889efea8d94016be8b",
+   "c047ae9b3d2391726700ede6082f3290ede16268",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "765e2d03fb4baf1852dcc87f1f2bf22a49619413",
+   "a1e4d2d8adcdf6ce31d723674acb59768c59b6b1",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "616eda833c8e77955db7e205e7850cbe22cb0a1b",
+   "7a1fd76a93063b164e697d47a35d20c624d748bf",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "b3b9e780904a3d83a9d19aecaffb67acb6ad9921",
+   "9b7cf05f66e8942ea379a7bd1af05708db5ac555",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "0e5301328081e358ce061f2bff16584122ea0879",
+   "6c6bf43a24da351d73249c4938cf1022a3f058b6",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "d14658ffaa2ace719f5056b88521b50fb0dc98c1",
+   "adbecffb5055ad8b9601fb43131ff2ca18c3c41f",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "47f1cea345be741163b746c9fe59c7e32bfde1fe",
+   "a0942713fda3f86974fed9cfb2e0ae32f985b0eb",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "de6142357317970ecdf49eb087f053755d13d61b",
+   "b37889b65b81ba6c2f236eab1f7a52764111298f",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "69833f84e274acb86f86a2fbff7462aea646fd4b",
+   "dad6e7ec9af0b8026a449559e4eb102f030d7afb",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "aca13b25172147862c67066c202a2d8aa96be0b8",
+   "0e379e4312314b6ac9033b6077f3d8bbc92a6c04",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "41e112b0966f83a6cd8ac0c4db1f3ea3c8aaa5fe",
+   "1f7a8985a9eaf9c63aefbc1a94eb77692dc33af7",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "e7de640c72bc0474f0d2c0634237560290e17950",
+   "2cbb6fd3489a6fb1610d396d1cd84b6cd39b5e3c",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "fa168fd9b11b67d978662b08626e25bf520f01e6",
+   "289aa3faacd62c4a5b7664224f239a77ea217852",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "506c4957d04eacb2ef2b78b27a0cb881cb0c1cf1",
+   "eaa417eca087df663bd992d9fa5681f3c725ecb1",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "553a6fd38813923f472d7cc61ff0b22b952ce1cb",
+   "2d2c6d6d04bb77176f33a658f02d83931181bc1f",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "68d11650ada41b3ea79a68b7618c0cd0b2874547",
+   "7e99eba7a8c0de14a5319861eb19e4bf051e5ff0",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "5c98dc5bd38d3033a6ff955fff01442abd0f7d89",
+   "a294cba7c53bd8b21f22bcf72265ca21735e652e",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "96b5d35daab1008dc752fc519c7182cd38378172",
+   "0f0f3f586c7061c81392fdbfbb0614a9a564c7d9",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "d48f34cba67d1c49e809406510245474e83e5083",
+   "29598521aae474ad8e0249e77f8c5ef35e122954",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "2321745a58db37fd0820513dbc6f3c5e6a053aeb",
+   "03618c360eb2ea6a16bdd000f81352ac06f4f8df",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "93a43ccff7f2190e2fc602b06a26dce302e3152a",
+   "1e785d961ab5f83fa3cdaf6bb1d8096599e4c848",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "48f17b2bf828a2a76d080f3e172e32ebaf663114",
+   "4e046873b80698f0686963ffd19a4a5df3063677",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "e4e1f25613ecca4a7d5fdf374b73e07775c16aa0",
+   "c61e82351abae662c02d9f815581ef965395de0b",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "5110aef69a586ffe9a448f68f9bad557db606ad6",
+   "96fc319aeeb771d19f522f2056cc07424fa0de56",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "688a5ea774348a06bfcdc9132640e68c33aadc79",
+   "1e54e3910e47c0519b5d9300187ca6bfeebe42e2",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "9f5d1fe4c00170c57d0bb14c679b5605723e3400",
+   "a67da15008442cdfdddc04b50b85fa45eda5ee2d",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "5344928b729d16431efb0764611a72b3c0d75bd0",
+   "b5c0081ef670b30fab9000c250f5747155867d4a",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "8f36bc8a214f0c6e29cfeea35134bd904e171e11",
+   "9aeeff94ea29d6e9e3f4831f2e5ed2dd5b31cb05",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "d14056f807b783ac7d09e6d04d8251daf05dcaef",
+   "0b75d68887554411a66fd7a729fac2a6fbc34b20",
    "testharness"
   ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "384c0434b07c4f4631d8f839ac9e3c3991a151da",
+   "2be11cbd75b1c632d25aef91215d435d53a775a6",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "a682eac220f3bd5367d3b10337044a320601ec65",
+   "5923bd66f218c216f82ec0c8686e4063d6dee687",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.headers": [
@@ -698366,7 +698936,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "f86c2410971bb36bda04069f60fd4c1909225830",
+   "cca4a0ceb6e239d7cd3e2d7954d3753a8d519ec7",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698374,7 +698944,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "ac48fc6aef1be371d01561e5ad1eb60627b8cc91",
+   "8bf793b5b86006bed7f85160039315c922e11883",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.headers": [
@@ -698382,7 +698952,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "2ce423d390bc76076f7b34fff0a08e3a6c4e9b1e",
+   "7c0a9b9bc6068ba1366b4ece8f691ac85b472852",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698390,7 +698960,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "ff00fdd2eb30fa39b01dfa842ec690b9b549b129",
+   "9c2b85af9b33c526f7ef12e6fc73085f544e708a",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698398,7 +698968,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "05ac113570a34d3a4417bea51c791192a9e86a7f",
+   "96bc005ebf9ff3e96427c6f963c64abc2fd04942",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.headers": [
@@ -698406,7 +698976,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "3334554521126255d2afc2d3855e1855827f7680",
+   "4e35615bf1b6952b9141491d2dbe4da721644416",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698414,7 +698984,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "26263c5b5bba8ec476d20b4a9d5bfff39d7d5e4d",
+   "b78a720df6887c563b3188bfb4388efab3cb6d06",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698422,7 +698992,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "583f80e75d04ad8af1c923c782201c861aea7b85",
+   "7d5905ba238960efdbaa054d3051b2ba8dbb801b",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.headers": [
@@ -698430,7 +699000,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "a90a29e9d880d34cb31623733597e60620f36d7e",
+   "5a8e1fd812c811fdcad799c061edee418e4f4c22",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698438,7 +699008,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "a44157c8f45cb9bf43cb9be32262fe7691e84f7d",
+   "f4a53c631d569bb8ff9cd19e76734fb0dd0d6dc5",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698446,7 +699016,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "754a7932af0a9f247ee5c3ddf4124440b75b5f9d",
+   "d6b14df479501a13286d725e8c2527d6438161c9",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.headers": [
@@ -698454,7 +699024,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "e9d4ffa7f2f651040eb2f8b917272219a78c5577",
+   "b5daa974365c947fdf7570cb5213acb3b8026e4d",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698462,7 +699032,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "cf42f306bfae7d5b91f62acbf234b7530b97d2ee",
+   "7fdc05de8d66e4a922be27882866f898bfaa8242",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698470,7 +699040,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "a1c3a41153cd3fa3406023fae0efad3addb388f8",
+   "c5b705bef4b911a755e57895387973ea94a83834",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html.headers": [
@@ -698478,7 +699048,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "53cc66bf3b1912df3cd6c1c1107b809861d386fc",
+   "926ed948d513198bbfaa4566f138608def79ea12",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698486,7 +699056,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "a7ca6718c100641094f5233c157bf0b321e36455",
+   "0bb7ff22833d0673710f999f25f1900524bdb938",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.headers": [
@@ -698494,7 +699064,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "ce275d2aa72ae9718f2fc30b646f553b6304348b",
+   "b1d5c24fdadaf54f4271387436ab4b928598964f",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698502,7 +699072,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "82f4495695f7cbaa241d7f9f06eedf80c1c060bd",
+   "29efe5be1eb4df6ce64d5bb581c5d12a69e0d6b9",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html.headers": [
@@ -698510,7 +699080,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "b92937fdb542f52c9eaa05c46198152ac45a50c9",
+   "79b406bb6ef98946c2464a17fc5c5e53d763d5ef",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698518,7 +699088,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "bb56f64066750b8dfa0983f64a7f75a02fd5d14f",
+   "553334e038b15e87bb3695105ed781df416b40a6",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698526,7 +699096,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "6b658e12a38c6dac7fbf909f7f310146264515e3",
+   "c23a6cdf19891d86c0737d79e2615ade91828170",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.headers": [
@@ -698534,7 +699104,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "e3c366d8e6ff8a776c4db3343b7b0afe452e59ec",
+   "7dbb28b150ef87904030e004b7f29cbb95abb686",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698542,7 +699112,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "f77583edb57912896fc46881e61a74d7dbde43d9",
+   "0f8c2d41b9adb19b22c94891c6a94ca650485a6e",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698550,7 +699120,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "e93152dbca1f8794f586f9079b8a7e28896a7a3b",
+   "85236c6263d051ea673de4a8707ae55f930817d3",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.headers": [
@@ -698558,7 +699128,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "442a92535e2d3a7328b966cc99fca60e73dbb8a0",
+   "26767fab0b35cc69088350e4361791521b1b495b",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698566,7 +699136,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "c977d6abf0d6824366d628671eaa23145b817012",
+   "2c98ba5babf4afdf68e5504520aa4c1735ea8ba9",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698574,7 +699144,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "f6ea03447a86b2a44b7230878f993f74f6553921",
+   "3a4e85ec7e6ecd582a1426d11cb82ad407b76963",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.headers": [
@@ -698582,7 +699152,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "d5649a0442cb5bba1468055bf39fafbafcda5aac",
+   "7b0b455205756aa3b465687a5ecf3008fa62fa5f",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698590,7 +699160,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "db7320e4e3f4133dd28aa672b34f76b054738f11",
+   "274f04abe69076599818e8bc01303576a74c87bc",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html.headers": [
@@ -698598,7 +699168,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "790b470b6fafd3f9a44074b016b1cd876494b792",
+   "dc7dfebee0676cffcdc3b84d74bc9214eb58d247",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html.headers": [
@@ -698606,7 +699176,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "b0a1155a7b6de672706e1e39b19149ece0f28d91",
+   "b2d25b69e3069ef9a4ae29430d06c99157606c7b",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html.headers": [
@@ -698614,7 +699184,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "c30696cc711f1cced02175c804d0aeb0e3a7a0a6",
+   "86ad248198ca36421a965986090a3eb47f15a1fd",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698622,7 +699192,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "6c0cc53bb13d5773e3191aa27fb3fd91727a0d2a",
+   "622f77bde2d799a23c99d41615c7b932a163b57a",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698630,7 +699200,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "109a92e4080608eed705f039558235aee3de7069",
+   "dab704a425dbf18c4bc7a5c45668887f4bd3fa34",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698638,7 +699208,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3af24e81b450052ef1b7811f9ddc8fdeab1ad628",
+   "878d948ceb3d0a2decd663a5da49d03751c1d6be",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698646,7 +699216,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "8c0cea747945ad79c7d04674f1c2da4972431956",
+   "603ecc5577953c60dca3e4151737868c9b7eba13",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698654,7 +699224,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "8d563e77529fd104c9bbd9f886eb70a3dedae4d5",
+   "43a132e68087bd38bc09b35b1d135064fcc590d7",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698662,7 +699232,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "f1b8cdf20bae5811eece8e54736e9fccbaf8f2b4",
+   "1bd76067b274b0cc8e0bd7a8e7bace26ebe645cc",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698670,7 +699240,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "167f2d2d88d3537844407fcea4702e3cb1f588d3",
+   "d00194b14373fddf919b705e8f368a21c7251355",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698678,7 +699248,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "6a8dba9757a8c5226cdcc6ff55f5efe252d1a426",
+   "2daad6708671e79dd0d13afd5ff82fd96a55e8ab",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698686,7 +699256,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "06eb373aed072586c4eb2469c7ba1b9fbc1511f3",
+   "1cda061aa01ea3346583e87fdc1d4ee7d1a04512",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698694,7 +699264,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "5e2a108f2f81f9295789fd7e50d5fee8dacf0d5e",
+   "735a4acbdf653c4ac67dfe2ad4fc5880719f45ba",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698702,7 +699272,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "328682e0974edc5aa1ccb66a2e37245cbe11f80f",
+   "19e5416cb3fb454a564da05e0cb319a2e784349e",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698710,7 +699280,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "ec2a37a2caf4f89fdd5c52b69691ff9b557eca4f",
+   "e45cbc673aef1a9547b28ba239218a1d742656a7",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698718,7 +699288,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "9dba3effabacdfbf253d157bef3ba43261ad7aa1",
+   "4539d076c498b5c2a385d60d2af98fd605d75d80",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698726,7 +699296,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "6320d8efc725febe666856edca8c7bf2ee7344d9",
+   "7f3e435f11a75749272ee2e89bef15edc5b6119a",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698734,7 +699304,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "02919e7ef97eefe8f1a70812458db723ea85d6f6",
+   "81607785f9aecee0c333472d6e5ebcdef4cee98f",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698742,7 +699312,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "bd042ca8f17289691a57f69eac20247dd6080c6c",
+   "a8a6aa1d8284cfaca4adddee4eb33db1b4dc0a8f",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698750,7 +699320,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "73f432c16a2686949ef84011810b5c3cc2667c9e",
+   "f1eba7aacdc8b8a3d3d15a7e49f8dbddba81136c",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698758,7 +699328,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "679ef88d99450704b87ac08bc7b486a42a37c94a",
+   "7ab0933178534647189dad28aed2b0ae1e59e304",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698766,7 +699336,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "f9eaa06a95c5c999259b8f247b1bb1ad79c7132e",
+   "29ba286e378d9520e58b8f457ef792f1415edaa9",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698774,7 +699344,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "b3340eeb24de9f074e95b878b912337fba027d77",
+   "0d1b267039a1275bbd030fd83409c3ee4dc56246",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html.headers": [
@@ -698782,7 +699352,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "45e2c2760a1aeca9f5919f5bcbe876f6de862a8a",
+   "dd07624a9990c8ee9a6bd51805fe3c3956dd087f",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698790,7 +699360,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "43051d368556ee72b9d4cdef010bd60007ffc4a0",
+   "38df795e3a527273e8dd842a430bfe6f6a2fc797",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698798,7 +699368,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "2e3fd52e4aa2a6c57396806dd5d492b8022fb657",
+   "525df39fd4b9d10cc94602f39458bbe5447a10f8",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698806,7 +699376,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "5b368ab7bcdaf934c1db5e8fe51bdf8af439d58a",
+   "a4533c649aebba3bedbfaea508e8db106e2be24e",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698814,7 +699384,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "b4866f9faa152ae1c0971bd4b43d5149a8e0a418",
+   "037bb3fee4621ec2560464927938994a067ab1f9",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698822,7 +699392,7 @@
    "support"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3d6aa3805a1bec52d4c8964fa4db05bdcbde8daf",
+   "7671fa5c539724e4b3f062ff2d09c68fb692bf8b",
    "testharness"
   ],
   "referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html.headers": [
@@ -698830,239 +699400,239 @@
    "support"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html": [
-   "cd4c32b93935009fe52013fa60ad21dedf137eca",
+   "ed415758d0660d20a35d45453241c50539c3f95a",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "387714fcb7748536246623940182a5e8dbc72c2f",
+   "085a267a574315c3ef79201716645cce9e05e446",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html": [
-   "cd4ee2d6fb26907bb491b5a3bbf098f80618bb21",
+   "cc554724b309b41326ade1d96358ef07aab875bc",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "16dd0012855f44b64b485333857698197dd49d5a",
+   "011ffcd01eb6882a4c2ef216bc76d921fc01b164",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "20ba4f05912ca4ff8ca2941505297a5d82edfa54",
+   "3f7d38759e9164c4702b3315fda85c6bee66fa37",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html": [
-   "81e8b03a642896a909164bc991625bba6754fa1a",
+   "f66e36d7a9b2ed7dfc98bf305265296c0b54ea0e",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "b3a4df0259644882a45be04f134432a93904b2d0",
+   "e10c1066d6407de1e28dc2b7ec974f348ca2021d",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "09aca420769579347c4763a290099b250d1b1cad",
+   "b3424b1ea90df159ac4357acdf1912aa7836db10",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html": [
-   "1497633d3652b2592574c4ff7bce2ed34836c709",
+   "40c2b7a9ff80538e4597efcfe68206419d4550cf",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "f74a4c0a14fee638cd2cabb1e1d56dd08aaca09d",
+   "13b9d94f53e651983f0c98f1368712ac686f8b94",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "e230f1cc900fc3444aa68542e0f4de45b2e04be3",
+   "e50f65e16b9ffd7cecf8e9e1046a39cee5d44641",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html": [
-   "7c5f43da6b2ddfd586c8369456458599eb9dc218",
+   "5b5dd12e5968a6e331c92b17560907ede8af86d6",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "57b33f26515303d7cdd71f74a92accea2b418b72",
+   "ebc18c61cdcd34e600f6bacacc7ef5b664e447e7",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "9bf8885fd8425dcc7ae307533fb973dfa9a1d39d",
+   "06becc108f4242a8a65c29e7ea96834c2fb335f2",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html": [
-   "8c6c5575988fe4da1658ccb79840231e129b0354",
+   "88a7cddb0b0b45d0b9be0b76eef78920142bc69b",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "180b6f5c30a5d1b57cdcb6e0b7d256c8b5332654",
+   "ebd682842212eb437f3528ea9797fe4169b8e9ea",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html": [
-   "5f8b261c504a9aac9439fdd7fef2897d4731958e",
+   "b50c0b60db869878263019cd538f40b5c91be652",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html": [
-   "8f44d1179d2d9881770f6e2f92602b317be00c39",
+   "df69d477669de463a732771d42ac960b23cee88d",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html": [
-   "f1955a0ae5d80d95735ea7135f5ded3ef7dad5ef",
+   "eda910d09224a34fd6691ad8d237aa776a0030d6",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html": [
-   "34eb383a5de750a179254122bec967be71f870b1",
+   "37370379123733391ab56ab9ef5f17a7a906cb4a",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html": [
-   "a76e568c7a246339c11dc1534f29802eb3c6e1bc",
+   "56e124b14703bf29e5939802eeabb40efebb92d5",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html": [
-   "ec42bdaf8128ee5ed3d584ae72488e3ba9051629",
+   "2d1110639e0fbe8c391a9d8d7b98cbf1ce1fc8db",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html": [
-   "a18a4ae4d9271ac81297599c4e52bec6f473314e",
+   "22fe64a09450148c529ffad93387de46e86c2e41",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html": [
-   "602c4bc4cfe057869ef21969dba585fc3fd7ee1d",
+   "2ae690c53d97c27f587fd4c7a2fc3fe959865e97",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html": [
-   "77b4460ea8e8b25d50cd44ac29af0daa691867dd",
+   "b14908a7b2cb7fc4271cbe54566f074053e84ea0",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html": [
-   "63b244f94ffb73aa58cb05b7b88cb4476d857500",
+   "485c8784c699bc4b8c93cb38a818965b1ff0e1e4",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html": [
-   "8a3bdfe72eb42b47ac3639507e581518ca79a23a",
+   "f81dd12dc60735340ffebbbe952929e48d9e6c0e",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html": [
-   "1281bc7ee4124fd234ea717d91fd4d1ee27ddf4e",
+   "484d9ec036ff84737e8426fe3281c1c8a4f0fc29",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html": [
-   "d78713d8c6a39edd75e8665b23f0c47be3976ce9",
+   "e566233091f45603c48235541df2ba68233998f4",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html": [
-   "22adee613d2509eaf917f15f0008c2e7fbb73cd3",
+   "f68dac93582cd5e7d1815d6c367662a84a2cab03",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html": [
-   "f28f6917a505d825da12f7d619c8cee0bdf181f1",
+   "7ffc2824a8b83c7d0cdb99ba27e0d550e465d454",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html": [
-   "e2e7ded149710d8ce8f0a10206f7ee6908a209e4",
+   "0834f026a39a6c328cb65a9e603d30196db8910f",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html": [
-   "cf2b5269048affe819ad402a6f53ac0e0943ea1e",
+   "6f2de0eeff1a23b74ddc877eb405ffc125b62220",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "a7d5d03782deebd0ba84276fba2298a8ee3ae4c3",
+   "51d538a7502de1f86c24d73b7c822929fe130e15",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html": [
-   "504ece5d888230178ca2e2534b6b1e3c3be65366",
+   "09e9945924b2c45fdf8d605673360e97a9634c44",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "709f577dfc4558baaa9a560ba1911b3e066ea079",
+   "ebd39b1026f2ab3d19ca43af7012aa0ecbb9fa49",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "c5cbe784834e76ceaaf68b4d2323b20f5f28e234",
+   "3cefbeb1b7d46788c7b6a5672a15c7835563724b",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html": [
-   "4bf9dc87276bfaf15ea56e92187ee272778749f1",
+   "1f883558c63dea7fe033a8c1b8a356a732d40aeb",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "d1b3228de87e978263cc807a36f6d3eb96f6b696",
+   "d705e0ad3247fac9ef208f64a9941daef6414fe2",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "562da3590077ffb1e19f10e2a70e23a659260468",
+   "f6a28d48c1c87bada3f91f60d64d46b5874ef751",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html": [
-   "56bf9a992efb0a7ae1ff7fce3a733eba495e28f1",
+   "a38fcd1affaa899d1df49f5fef443ac3679a04af",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "3fcff7ff5caa696e07468b57cee23a1d3bfc45ac",
+   "9ac2ca34857a77a6729ccb2aae308e72c339deae",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "7b87fb43bc307e669450bbce84c0e4614f013e99",
+   "1dc4c4cd4d1434d9c926697e7b79c8c02759b0fe",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html": [
-   "5d0a7069193ceb586f4d510a256d317477e26258",
+   "1c28100003e25ce97c9adad060a51daf895ebebe",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html": [
-   "5997b07976539f007724306e0cd8bd34b587df6e",
+   "8abb5198b865f5e37d740b3c309db0b908351fc5",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html": [
-   "68dbe6d2a52098e3e04f540f0db41bc0775d5df1",
+   "9d4630b46c5fbbd68e400010f3df300e4ae770d4",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "30972c3a693a9d2466da930fb96b58696483971c",
+   "58e0f26e2f8c208b6dbd1f2ca7f0b67185a1d98e",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html": [
-   "3646d06a6d8a62c4bc058cac1be1b2733e66803a",
+   "f47b1f3704618292d0a7af17a2a09983bd1dd474",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html": [
-   "b885670555e4452f6db7a132c87b880d7e7c0520",
+   "b45744a94ea9e6d78b225895ad04a572269e4458",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "7e1b68370d283f75fc1d15371b12eec1cb35c5ec",
+   "d2061267c24a87e75a1a19c055b9c4dbacd8d77c",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html": [
-   "a04b753a15dec7a91f4de38ded13b4e52534b89b",
+   "5f35a68ef064b99f3daee011e185569cb0ee241a",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html": [
-   "d0009e0462a582dc685b3d6d28e4270d9b72f2cc",
+   "e9787edaecc454615bf1c065a579626b67e58897",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html": [
-   "48bba7e7e8cbb547950bf740a966426806295b40",
+   "e00a911d55a3d90215651ee693da2e80b18a2e4e",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "61273ce04dbf84e9f2ddb6de99ee1800891f5e00",
+   "699e73a837f9ec7d1dff1ace650456c9c845efe7",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "2f5e63f5f6fba3dc2b069d7c22afdfbd8c753408",
+   "fd369ed2ec5f2da36453ab3b9bd39e2695fc43d0",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "1eefddd0bdcf81ed8e08f440a790d2b4a006e64f",
+   "426a91f7370a55f1fab13d8fb2d2e3c3c0f6ff97",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "160c3cae70f305681beb205de286f85a46705297",
+   "f0d6cdbf00c720d54d10495703455a1efccb3e1f",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html": [
-   "203765c8c3034102c15462b49494d47c44302106",
+   "18250c8c3d9c110c24d0614008973132d01844c5",
    "testharness"
   ],
   "referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html": [
-   "7bbb54db6f99607ae3bb5436c125f91c7b2cb798",
+   "019debb40a53427247f6021badcd184878d67d0b",
    "testharness"
   ],
   "referrer-policy/spec.src.json": [
@@ -699074,167 +699644,167 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "98c847f50510a93e845ebe85d4c148acf5236eb7",
+   "849efbc4e7f285e38b9d8f6e747f87cd1638121e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "6a88ec1b6afc74cbe5f6d2e296303dee0e974a92",
+   "d3ee7cb684b1e59ff32a101ad3034c2f9ecd53b7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "a66dd71e7ede5ad4bba95c17cf66a77a97d8cbdf",
+   "0f8d60ca672f2a9b335486120b6d81a3088efb6a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "362b875a9901e84aa6e76e537949cfd2f8e1fcef",
+   "f09d000eb723a6166ee5bf85a3e93f771813b042",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "739a649e2b3572ea6c45f2a6b62583ad983a93c5",
+   "e28acbe94298d32f9d34ff3307993c563ffe25a7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "205080652fd51dc906ef9f7bc42deaed2ecfa99f",
+   "948bb08791912b5ab811ca34da60a997c4e45cb0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "d194c9b23929a0b89b56a7d04e7670cec6bce6bf",
+   "ebf8d26f51746bfcc3582006b012d96a9216fab1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "896f4df07514cff09b7e02dae3b88dc7a96c820e",
+   "990f752a23d090d7393b2a676c23ff7710496efb",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "9939c6794812072e895f9efe3ef7d52429913658",
+   "66f41a0e32574feadfd911114f7d48e12b5a846a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "1796ffbd26a2415d9b6e9161dbfca75f9f8758e1",
+   "8e23ad41dedb44702abceba00b31d5a720b19767",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "f17d565b43e0b52bd5aeeafe55568c5f68503d48",
+   "3baa66d36b82f19c60c3f85b5f6e2347d43418a4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "be3469eb37f0f58d159180d408bfafa2ea048e1f",
+   "e5c060c86b3b673d7c9e5360bff394013c7a0267",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "9b089cdac2d3388a581a0bb942f205185488c562",
+   "8b036117d70250ae2f624999afecf0c00fedbb23",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a58e196c21641e9c04870553e91b6823a49a6024",
+   "e165003f6eabbdc0de301971e3f04743e5eb876f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4e95aa3c58eaf86298a4cd3302093397a950b4fa",
+   "42492e23b77ec9eb33c5114594f5043f7773ae48",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "d97f749f00ea264c4c38a97e449c420306e99b9b",
+   "984b0790d4254ea9c18fdb5eed37bd5b436d05a3",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "630d21df23735821bf3242baf550de84a4fffa95",
+   "9bcf3910c1ecd04a9df83d300398dd42ab4a632a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "58922dff54fd7d2c0f753dc9d5d92be960479094",
+   "cd8c557f05dca5eae753516200ab2c18ec2fba61",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "05bb00af49fa2a8c1faa82ef0a3e06dd80f322c1",
+   "c38f30635362dd3301e5b37b38b5534c10c125e4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f737207b916a123ed07223a74c50e1877ccfc5bd",
+   "b38e3d4668b89e961ff4b4d6faef3fe568de4c3b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "85611c41e3a5b0088807c70831faf386ee57d961",
+   "a90739dc4990357d878770724092e77241d485f1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "ab0895dae0ee842735217b06ba9210e0af87858c",
+   "83b3601256f6598d4ecd45da954406b7c8363757",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "e7f413f4badf79f013de16abeb267f62536dd7b0",
+   "72dcd1d2738be6819a7633f3f46b05f6da2d91f9",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "17127f4d2071406c4da9d5da72feee4ca3db569d",
+   "b56aa7a2c44f5a81ed4f0070c931e7141f620b35",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "851ffa37b342f1ba18a19e7e5f432eecc6ff1cda",
+   "bc6c1bfd1eac88b62d7692257087acf1bdc4ba05",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "044d1165f8602c529253210561f072adcd9dcea2",
+   "6087f4b7db9ee86274233ed54c17d812932eedbc",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "0c8bd4f137354382ce520198454ad20874ec1541",
+   "7d2599a1b7137d8dfd030cd49cf93781c1aa8180",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "6f890f66fb492923713f92eb1c9b6bde023b7f6f",
+   "6581ee64e4ab670f5eeab7cf70e294872f823985",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "397fa9cb46922bb88be571891b7f644705b9e40b",
+   "9403ed73bcdac48aef3a973274e980bcbf73f56e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "6fdbce59c04617058fac524994b20b75c56dbf2e",
+   "5345da2d6d45f40c793760d90aa5d1c4cda84b37",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "21b089ea62f91370ef80eae3c39dfd9835fdbb7e",
+   "7230246dd234ddd552116923751f8838413cbf8a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "593531dc9bb5d334bd6160c171a732cf236913bc",
+   "382334bba5cccf71d99e6abbbec51ed8e874270a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "7dd540b4afd325abcf7e0281e8b9120b1d2a8f2c",
+   "8481ed5ab38f218ab79abce299333551263eb6b6",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "985461620b54cef1e47dad42120c52b8b30bd9f3",
+   "db04cf7f5cc7620372daa6d0a9c86a6d1dcdcbff",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "9a8387d0b41f459deb8be7d369ba7ec6b57cd605",
+   "d35d0c25cc029fab16c1e15b958c9ce0a1ef9756",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "01ecfe03cb97691fcfc62e308ae86baad2d167f6",
+   "1a6e2a4aeb304f4ca897598060bdbb87bb270a95",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9271c730a2a2288df55e5fb962a05540283a5583",
+   "117a3dcd2e95c932ef2bf0084374b69472d626a2",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "69ba51cd60508e23177c7458041c7df9065e38eb",
+   "bfd21f6f15f12bfe1123e2d44c699b9611097641",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "c6ff5f31708ec3dccaf315fc79b0f247ad3d86e4",
+   "2e6a113369b5bbcb6de531d36ba95f4fcfa66ba3",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "91fd73f0bb7437fd1e8ccafab35f3326466def98",
+   "b9d2ab53f9a22f4b2add660ca90793c81ef47c86",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "24aafa27b296ee7c67a761454b90e691a58c4675",
+   "4dd11a19be9285e60bc044dd955e808ea8871918",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.headers": [
@@ -699242,7 +699812,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html": [
-   "cb33a2370150556c827d7261e47f70ce6cbcddc4",
+   "a65eaa7901b8226bafcf4bc79b53743b9eb3f227",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -699250,7 +699820,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html": [
-   "322319fdf9159b4ddc1d94800a1f76301c26df2c",
+   "7d5e9f51eef167e58e3487a5d415d7b19abf12de",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html.headers": [
@@ -699258,7 +699828,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html": [
-   "f1a38d55adf6c238a42cb666e73a9bf45afc5331",
+   "bac63c5fb0e01bc986721007605b944ba9cd4a24",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -699266,7 +699836,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "508405bb881b1eb9f9e540693402ebe13f6acfbb",
+   "60d5073c3fc1d74d7acdb8e1c41d5aca39e58ae9",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -699274,7 +699844,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "fafeac9f9887a45f4c75ca0c3b9736b008e5804f",
+   "6be18f7699de255881c679427696c5811714e00c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.headers": [
@@ -699282,7 +699852,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "4b65f3066c2f176c86fbd9eee7c8f70c908c8680",
+   "952e77c9cc696858a6fcc455c7397556ea0d190e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -699290,7 +699860,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "a47d8059b167e7bed9006dfa068f11289840266c",
+   "48f71be2eb18b34d00592caf6d953e9df61efaa8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -699298,7 +699868,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "5106ece01b0cd221eb97e5dbd33cc648acf183e9",
+   "a28deb3c0dc087cf32959b5042b60b175fcf4572",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.headers": [
@@ -699306,7 +699876,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "e0c5a01d58862dcc9e45964dfbacca7f76035204",
+   "2ebcc268d9326694b3372cd1e8f0f288bdf06784",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -699314,7 +699884,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "6f0cbb6da67c45f7e96863d535b20753ab86f379",
+   "6425c693b33390a9f224b682a4d4842e3e9a6c43",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -699322,7 +699892,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "0f840f6b3cc6416ec80e8e52344f4d7af1ed24d3",
+   "fcae5517b70fa522a0fdcebaf8ab446567d902ff",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html.headers": [
@@ -699330,7 +699900,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "30ba21dbaafc455ad99f7ccbe32ba2fea6e1f22e",
+   "92437dea18b3809878f44bed97975fc1477ec646",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -699338,7 +699908,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html": [
-   "a45899f8680a345c59f59242f76987a8ce53dbd0",
+   "9d2f1dc7bb05644439ded95ab122cc08120ab3f0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html.headers": [
@@ -699346,7 +699916,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html": [
-   "f28a7dac315998d7fd1fb92281bfa5846f56731f",
+   "77a7c7198da445bdad4388fc789e47a9c894b0f7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html.headers": [
@@ -699354,7 +699924,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html": [
-   "36647bd217cdbbe4dcbdf33ca312a7007195d973",
+   "490c294ced54d95ea0d7b01a32a79488440335f7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html.headers": [
@@ -699362,7 +699932,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "b37a41a0f79f226f209e7d347b82505bb2d133ba",
+   "22f1f3bdc72507d8c64e0af65d94e4f4df3813b7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699370,7 +699940,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "29185f3be8ae2343669a108eb7cf3d3a30544325",
+   "bb47761b3b592311adf367826f6b8c12e3d8fe6d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699378,7 +699948,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "1aad94ca47dd2b70aa8948262e87795a480f9407",
+   "4dc7edb6f57117af0921062cf1002d121cd71abf",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699386,7 +699956,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "20c4b42180d878c32ab0fabf0849d92921809969",
+   "11d7fe3e2615b8dbd292b19e96828f64bf402d9a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699394,7 +699964,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "431bcc296310d82579b476be68590ad3c64b760f",
+   "12e2c923aa91f32303b50d21c464e5294e7bdbd6",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699402,7 +699972,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "26ea4bab71c2b7b33eaa33fca71c29c16332386b",
+   "269c233f650eab06ed06ff43c169c11d39a3e16e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699410,7 +699980,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "cb3b22bd8875a184f80393ad49fb0368c2daa69d",
+   "3dc041adb2badfb2316b75dbffe974f2a0508d13",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699418,7 +699988,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c1e09f76152c736f5aff47d0c0848f27de432c14",
+   "7985b8b5397af14023b10a458cf4bff381e6362f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699426,7 +699996,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "9d8a29e3b21dedc4b7721523a0f6d0d5eea82fd1",
+   "6f2526ec2ce8aeaf9167692df1c905cfab3e796e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699434,7 +700004,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "18bb1796e0f52a2acde62d62cb8da4c5fc5253f7",
+   "408a84a46e951c36c0feb9bdd0212a993e95920b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699442,7 +700012,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "02d240f4ef643b2b5d13e0b6aaf255425f12267a",
+   "73a6d401686e1a0f95f9f8bae9869033bc349d2d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699450,7 +700020,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "7ff1c2d477f26308cf0d563f50e60743d4aa3447",
+   "db3836944c071dba460dce59008ea6fa17a961f9",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699458,7 +700028,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f3234db7fbab2898743f0024b6f51ebc85a9e8b4",
+   "3e93e19a7183a6c4fcf410cc1e4a8fa454d2d386",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699466,7 +700036,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "cda5c213858e7c280337a20eaf6512ecc8069a6e",
+   "f556a17b5f43bf05afd4754e3cd640e936242a8c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699474,7 +700044,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "01b9b2f6d45cd4593724bdc1697b2bb7c372ef2d",
+   "966ccd4a906dc0d41afd3ac3ee3ff674d367a503",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699482,7 +700052,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ab501ba48290b7f40c87fa6c8f4e9eb8297858ee",
+   "b0f1c512bb354c56d3f510c90450ca4ee6c18699",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699490,7 +700060,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "d731d349adf8bb3e9ca2b03d3ecbd530f8555560",
+   "26ba53745768bde86374b247c4543ee89ae0bc59",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.headers": [
@@ -699498,7 +700068,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html": [
-   "d5fce9bd4c747ecbd2f98e4a2b7773efccee1807",
+   "3c24da11403ba810b323e612cd6f159b87490c90",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -699506,7 +700076,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html": [
-   "1bd6d4d7af2f9861be905b4c80d4a7491ddc6efe",
+   "5147d1ae55f909add4f70d4992f513c511f0e8b3",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html.headers": [
@@ -699514,7 +700084,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html": [
-   "3fadc6ed1d0eaa615f2cded811779a5b21d6b805",
+   "5f043f56d9cbed2f7b2705ee75382ee730d7cc9d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -699522,7 +700092,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "5314bdc429252ddfa798d98cda2e11f56797613c",
+   "7235b46f693e4457851cd92e86ac7d3cba8e1710",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -699530,7 +700100,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "e480475c4c161b133bd3c4e3ee028f47e6179415",
+   "898791470cd9ee167418082b55997ce19a6abb6b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html.headers": [
@@ -699538,7 +700108,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "5b663c86663c2758181ea8bedd714f614ab06f80",
+   "915a0e04cb1a09f33261aa9fe94cc422d1bf45e0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -699546,7 +700116,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "1f8ad54a5e0d4411f4b600bdb105981bfe2430f3",
+   "2b5c254b315f0bfdac8a08a7f8980bb43da4609a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -699554,7 +700124,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "7cfe3c956084d8b9ac796ab8fe04202902204a68",
+   "448fc03146a86d8f18d8ef8956345ec40ce708f2",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.headers": [
@@ -699562,7 +700132,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "3b118b1573c398e889ba3e47e83b0e9b6fb3172c",
+   "b71a1ba2fea9cfb6325ae0e1f6303372beec70b8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -699570,7 +700140,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html": [
-   "fe0acac1c2a8e09488b97812f0e234cab83e65e6",
+   "c23f33e377c37bffd6eeeec7ee4c5914653d6875",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -699578,7 +700148,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html": [
-   "994f4980029730a25812af7fa6a20e1a5b4e79d4",
+   "0f8a61233184e8cbc45dde9b78c94932eca42f43",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html.headers": [
@@ -699586,7 +700156,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "55ea446adca1dbc3d0fcec3c5b20e4b108f0e3f8",
+   "25e7bed49668540dd91052806be7e1fe527ccd04",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -699594,7 +700164,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "d969209f05e7724f0dfb39aa41c982fa773c383a",
+   "0366ca590a20f83d658ceb67b05316e7fe74f892",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html.headers": [
@@ -699602,7 +700172,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "c870703a446d4665138dc21ec94e43246b76eba8",
+   "e43090fc94db3696d4f02bd4e7df47e43c48fcae",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -699610,7 +700180,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html": [
-   "af83435da71e9b71b96fdb3867a5a96b86f7ae49",
+   "94737a8ad11f4ea7d4c9ff65252a3aa7ee8cc60c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -699618,7 +700188,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html": [
-   "939e659235bf63c26e357578d80860f24f7c9e8c",
+   "7f20701fc23b5b089e05629e3151cf7f83b24d6b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.headers": [
@@ -699626,7 +700196,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html": [
-   "96e809bc922ba2005601173a84b52dbe3e898e83",
+   "1e0251a14db6b0415f32eca350357a53e8abfc86",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -699634,7 +700204,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html": [
-   "133cb3f8152cbb7d1e337f9fd96f1d82075c7045",
+   "a04b093f0525207dadb659d96f36a704aaf70d9a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html.headers": [
@@ -699642,7 +700212,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html": [
-   "2d4ce605db2fc3b1cfb92d71589e9aec1fcde9d2",
+   "4c888a8955acb7c8a054163924cde507bda79e07",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html.headers": [
@@ -699650,7 +700220,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html": [
-   "62e3401af57ff3c38cf063065c3b84085083764f",
+   "ea5c378b938ce2a66188ab352fcea39d81a687ca",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html.headers": [
@@ -699658,7 +700228,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html": [
-   "9cb8d09c95769148503595e3393e8069ac8d812a",
+   "f95d9dcf86267fa550742e4c39cfe8339abed669",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html.headers": [
@@ -699666,7 +700236,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "474c14bd28461b0af80b69a2f3f774e9bfd4c667",
+   "2fe55648eebf16c4d566eb6514f5380a060119bd",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699674,7 +700244,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "4527f4c14d7ca43a83e46943f4f99a30452ab1c1",
+   "805c1fce6ec61832f4168bf459977e44c161e42e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699682,7 +700252,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "df2c18b63d7ced122ecf7964e0b519155578b712",
+   "3be3cef8fe6e3942c56164d94efffaa791894b0a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699690,7 +700260,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5fa94c07a4242e63e547b7bb73e25e682ccd8155",
+   "001876c67eac2d65c0691d6fab6c9bfa4d3f11ec",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699698,7 +700268,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f1462a3904e22d67dc8134a8d80d75d48c7e8781",
+   "d065511201c53b37677864f7203d35c5f53a8fef",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699706,7 +700276,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "f3f4eacdf576c88e4b07eb8e5cc0fc7a0adac5ff",
+   "8372e89bb963b59ec9a0032f20e470488c2045af",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699714,7 +700284,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f113c71f88e36d58e7908979f1d16aa784273151",
+   "0cb91426123cb96a1196e3d062629aaf342d3cc4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699722,7 +700292,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d4aedcd44c3a9819fa14c1707e26935001b5f89e",
+   "880ac9540146f6c72f4bbdc1ca67e402712d663a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699730,7 +700300,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "50e35f214ebba47f369175623ff3512304fdd0b1",
+   "d1e21f26bee30a723a7f427c05b7a0b0e6fa256f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699738,7 +700308,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "295a8e28d36c1c7499c64ce2a1f1f00d97227155",
+   "81ea510e48283f0ddbedebd8a728cc61849bf4f2",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699746,7 +700316,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3dcf63d317523242872717aacf614641d2c1e1b5",
+   "663532798418ca23df55ce3f7927d3a933ee85a1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699754,7 +700324,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "a5eb6db025a96858a11c31ca0cbdc6062d3a5d2b",
+   "d9bc87d7ed19fda72fb7afefe2a29e1506b93af6",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699762,7 +700332,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ec19f422cf74563957994279bf71e598c2de65e8",
+   "f4c0db2b33b9f959804de082678b4244d2b16de9",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699770,7 +700340,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "551856e96b5cf6a981945d309cf0da2c5a41045e",
+   "e0a4c18164a223f656bca20615acc77ae1898122",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699778,7 +700348,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "d19eeec61e2436ffd8f856df897033f889c8cfb0",
+   "ddf12c7dfbc00c191b836368289b5a3e168809fe",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -699786,7 +700356,7 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "323962143c3fc5db6247a68bb7475dcf5bade0a5",
+   "967c856ca9453215c14f47682e5f5c384ccc1899",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -699794,447 +700364,447 @@
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html": [
-   "b0a852d431c2405b8ba1c5f37e87c833b16e7380",
+   "e2c794e2e2703178b33309c15df52fc5a92933fa",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html": [
-   "d12ac42bec27085c48967012818acbb05ade8c07",
+   "1d53a856484fdd89788f01d9a4b845effd7978dc",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html": [
-   "8d2050bc6b8941f533803836a02a6d8eb2c0030b",
+   "11002b84ccd9df3557d2e6ddbf02cb16ad2fedd4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html": [
-   "e77b1cf749f0c4dc72f5d722d3d85552d4d873e9",
+   "0660a7152c1fcc70b13f1217e8d5c322eec9a588",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "f39dc4a867a1b4d7bb117ba9246679389fc944df",
+   "6dcd7f6fb5cc911026deb559215746d75589d151",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html": [
-   "80794c90460bdc6e802adfbc728ebe4e29685614",
+   "0776180d9a21724f75f8e9a425d8ea63f62712f7",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "0666e64d116647c14122fbb5aeb4f2522468f7d0",
+   "38e9578454e0fe748dd9cc37b4c954a55c81e7ab",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "8b2e83b163ca4dd6602ab511c60f85e6df9d7fea",
+   "6f0993c801077a16480913be20c0375af1eb9eb8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html": [
-   "6e4127e8d8b103b0e85d1c3929c59ea5bf490cc2",
+   "9e03d5384e9b34246df8ee78306ff83c71cdc38e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "5a821e9be18a7f366428c99b43c3a75c7f4eb12b",
+   "1a928cfec18993f7e92e5d9d500fa595e9ca4248",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html": [
-   "9f6900504cadfc40b577c06d1a712a381079db20",
+   "ab822dec774ded2572fe0d66048ac412619182ca",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html": [
-   "dca6f9a5783af1f1ea73b9dd92f7d983ca24f279",
+   "c51ebf6c472977b322e40b09cc6b24a2b6301713",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html": [
-   "dd77fa1e854a0e3defd3e7dfceef7009bf7c5164",
+   "14ee299d92afc533582cf1c6c61ecfeae34d6b2f",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html": [
-   "f700a2e44061c4a21595d4c61ac075fe816d8335",
+   "ead14cf5f9d95cc7948facf9132ebd024e0ae1eb",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html": [
-   "acbbcf40d2db32ea8a954ab09c967ae416e06be7",
+   "1ee7fd41367e463deced7af98706b5df55374e64",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html": [
-   "e30f960523c419effb7efbd9a0019fbfc3255591",
+   "0110bf0e34f804bcaa84de2612fa5669e0ecf822",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "a6c9d8d09e0a2e9e3cad4a46aabb03527c2f8379",
+   "12a1bc66e0f32ca381103438654b2bece3152b14",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c062ad75f5c89ff202e3af353ece6eaf20a3e5b8",
+   "05ade9a95627e9a26924d4cc71f35bd9505cf527",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "af5ee5bb98332b491c551c86fa5c3d28de6a93cf",
+   "ad0fa26cee566fb4b6bedf853380d63813f8c84b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f585f96f2fe6f843b13f639f79482643d364b9e6",
+   "074dc1c008c7bb8e8fdde6f8ff02c6853eb1f221",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "fbc89f63472415c1c8476b05b7addd4af0ee1402",
+   "02a8550756e871660b27addae7ec82d416988d43",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "3826723cffa0edfb2942d564bbc1b8bc04e3c890",
+   "c67cc2478a0c4ec22e2aaf7f6c5d59c67dad6ee4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "b7b973ed00d1998c8c7174a8b9253504f977f5a5",
+   "e53c8315664a59467e4cf9104ec53d468a16a506",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0aa06dd0477f62fb8e49a807317d83bce558b2d4",
+   "3e11ade1bcf49632358cb1369706410b127b0326",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "8c5db573dc900a958a3932742e33452a7fcf5d74",
+   "27c4c842c947d851d30f484899de7817cc3b9b30",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "068f3a7494d01f69ef5caf301df37687e42c331d",
+   "f28e884825ec8151381ea7096a08ee0b9970d1c0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "50c0bb6d4995c9d41a0f18e49ce166eef4af7835",
+   "5c8ef0ef3e36534c6f55d20a350eea2b057cc8c0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "1017cc3a28a5397920f26381dc1c9078c50fce39",
+   "bb9bf2c1ee527e28565534ee1c2d28822c4fc4ba",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "46f518e21cda76479e8f40adf6c9b0fff901c6e5",
+   "a4798d7b47dc4b40d8ccab8ba165960dd39083e8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "156c0a791141a5c7e5824556ac7ed06c36927f8e",
+   "0b58c64c20083db51771bd7c3cace87a110ee4f5",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "13734caf4c765ffbf54ce6036df9d50b249e1996",
+   "3ab27355d0961a88c2b5027d5a23c43181deb5c4",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f921e398c87599d5c54b550f479269852d342899",
+   "6c8d7ecd7b86dc645eff07273de21cce82e4bb94",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html": [
-   "739830636c11daded8578f69934975e5c4564b29",
+   "62b85068c20f75deb45c338bbb0fecfdef214f38",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html": [
-   "d0044e5908d5990f49becc36087e2020a7775337",
+   "efcd74ac789e061e8bdf00f71b16efa680feadf0",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html": [
-   "18de1edc8e2a6a1a0ba540b70387e581e5331c05",
+   "eb84455bc12bbd49cf390d13c16a7a1213686249",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html": [
-   "48f57a97c610e4183406d7882e7e98892e2b17cb",
+   "dc71fc362ed21dcc213dea7b331b3db2d70ce51d",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html": [
-   "2d05a1e8a09ef4ae374e7dc58a092f0ae31ac650",
+   "8752f5d2cc850bbd9a3641d18841348d11178b2b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html": [
-   "0b96814554144ee28b3801d77290966e6624c2c9",
+   "4c3a3e733ddabf4cc85d1adefc938a557d97ebbd",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html": [
-   "b2b7ce96cabdbbe18a9bb4b95cd064b8c0e34040",
+   "33640559429c05e53955c8ea74c5e64e8500ddfc",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html": [
-   "3f497621ebc503acea994b062fcf4a412d48e065",
+   "9acebe2f0b09702c5f00103067bc748e9f4b5744",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html": [
-   "b8d150d39aa4b90f3c8cb2ec7eadcf8da5032114",
+   "d1f8677bc8b25eaf2f27b83d91ccad1bd1bb9b41",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html": [
-   "16f7ed4ec077f18377033b115f398285879432e8",
+   "a205d415fa384d246f497656e6bce1cfa161368e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html": [
-   "32b1e0dfab8b6ef2aefea095ef470455acd64b3b",
+   "dbffdfd9b707e88f5f28860eee87fe5f443c7631",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html": [
-   "5299292a39a5ff8bcc5aa142ea8114ee20a3c2fd",
+   "ac598a4aef96049385b08267dc3c377c2e5ee376",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html": [
-   "2ff8ed8e516a4f04b8ba16d8f2ba9bab05ec8d86",
+   "fe796af905de4fe4111cef8abea5e089eb2b83a8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html": [
-   "6fcf861fd26b6450ae19a4204047af64ada76593",
+   "df0b66b578af3223d45b29041558bf4e1661e04e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html": [
-   "f523700deef31f6cb712b1219f10fb947f0e887f",
+   "3e6a5ef1e50317b735fdc3abeaba0d7228a764f8",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html": [
-   "41d8dfb4063a3af26c942c4daa6e4f0dad39d0eb",
+   "fc8d3c41bbbc5d1af4c4482e6de160d7978a3b70",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html": [
-   "b7357a7336187d3b7a9c196037c04f4327d57eac",
+   "3291f436ea9a1bfb7a8018bed641c364c1446c1b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html": [
-   "af24a7c3a0bb9d3b4854253f375792efb85259a0",
+   "19ad046a8a67f96ce419bb44ab822a02c7b7682c",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html": [
-   "a70b0e72e387d0e007d9ccf28c63dfe0df1b811a",
+   "c8fe4c6ec6f86915b77e6095a6127d099637c825",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html": [
-   "03018d57bd0ef467a99b1444b191d143fb981ff4",
+   "ec2f7efe8ac7dc521f7b2f25668d96482d42a175",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html": [
-   "42e86391b26c864a235b3c97d9e798b2407cb12c",
+   "207a092d6798444ebc8a83af699623c50e097684",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html": [
-   "09a483fa9289adb02f96023affc9c4a1b253b377",
+   "6ca54f8161040c78f75e411cdbd844cd0dfefef5",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "614d050f1ec25f47e0b84e2085413750797528da",
+   "d8ba3dd25db345606c23cada85894fb6a4438456",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "1bcb11e8e06406ad735f86f6d6bfa4671174e8c8",
+   "6d3dc7018c6a28283c1fa349127a96952b4517e6",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "744d2ef10e3c360d96e21939c66aa3c7bfbbff9c",
+   "685cb213ab02e952e458b4a9cd517c5f9b6fd4ff",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "84b48ea87d06a8206ff6d8e38e0b8443522e7ede",
+   "65b84cbd52ea2c2c0df226a61cc982fb61c3b3c6",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b6b7315f64122995a27a62ed88c48055ad6b1d5c",
+   "931a865b0a02b7ef2607a09e061f1ebdf1443035",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "f1a842a91611f1e151a889d5370790484ce5ef11",
+   "44da9c8838ea94c82e1f3b7c037c93c3b5ef8a6a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "bcbc4fa60630851a6627083a82c43104db792fb9",
+   "3e272c6f36d9bebf5ca281be728511943a851ac1",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "dc49acfd7bcabcb2421d41f135956df1ef38ecca",
+   "4b94af4929c8b30586ba2b477233e7e493103b4b",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "5b1f0f8a5f0ca39f90b59629d56c7be9759ae825",
+   "95d6345f7c4034ce5f7d8c0c3302f921a72357bb",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5cc2ca54a08f7c5471c3af1c17ba7238212a8ab6",
+   "17f127f60366df1597b5187241a7e7437172152e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b5304e1222166ae2cf73aea0a8efa39823c3700f",
+   "bfb222a4475e3e30e4157b226a6691ad8a8cc36a",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "5cf441b8bfb9a1626cfd9b6faf46c21d10a43926",
+   "e989b00ce58422bf96d5edadc6bdce3bfe8a5bba",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a259914ccb5438f357d2829ac5714ec241b1db20",
+   "a1f1e0e6f1bb844ba25187609dfd4e5e02bf3f3e",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "20148fefbc06bc6fe3ab9745c2d3ecd46dc90748",
+   "ec4786e1e4da125ba01fb8a32debbcb749625980",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "ace1c310142b56997e16411483ac41f791bfb799",
+   "baee333cbb8e278265153f34cce2ec68b37f6924",
    "testharness"
   ],
   "referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "8479327c2a51922b32f5510798f2f83c2f48a815",
+   "2041b46c26cadda361ddaa2843cffd7f1ebb7f77",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "f6b970af922e88a5113106d35f8d4545d7364959",
+   "2fb347ef35b8ecc2206f272db95156cdb9a0e771",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "792597f6ab1538c430e9fcb8bc4ecbaa58a3cf40",
+   "0c34da119fcb3634866a7fe153256c3c92fcfa3f",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "d084d7d02812e5d30b44fd9ea6a098b13581d217",
+   "f992e3939256b8eb977231539bed90323c4b3ccd",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "bea3f45b42f20b9546922989d0af2d5210944da4",
+   "e1e6c13ea358c7f8f0178a37a30505271bb2b446",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "96a6b20c97dd9161c59aef2ea1af51fd206e07d3",
+   "fc07b47fd6408b74c6767dbfc385adf699844614",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "0dc1eee0d87e359bcb3cba4aa5be7ff4bc159a61",
+   "083891dc3c131fb56f8d5372ca206b597c6cae71",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d19621cecd11758a3ac0d346d745d050ca0300f8",
+   "07601e37eb0bc39eb87bc3c8901d27bf6792f61f",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "957091cae3c370c21ee512a1ae37a9d97aa78adb",
+   "811265f11cecd9ca5e83c8ac4c51bd1f29c14d1a",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "8dece5695f01b26364322c38ca6ec287cf87209d",
+   "254a29152f87e95359fffd4749b2c625d379c3d3",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "1d8dc4aa39ef24be25690d00dfc5085abf5e6ee8",
+   "f78fb878fffa6e52bd41177b219b019cb03bd482",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "068d753395194402df2dc4afc8f8a8debf6b0bd4",
+   "9c5035945c9081f4527343ba6df6372050def682",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b100c0667c55ff8858d318d647e59f27a7148145",
+   "4b238c0449d93ae792be3d56fd2d3640b28ef8d2",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "1303bbed50b0160c1097b4b2101cf818d56be0c9",
+   "a860c257fd7cf4566bc988827416c09dfde21392",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d311f8e74dd3a50d17cbab2253f8b6e156910259",
+   "a798c85d6f54988404b28b9afb0017dac6e8bcc3",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d3d12931b3457924bdcafb506130e1f4dd18a15b",
+   "3955b78f7ac922c6e05c118dd0c1c99aa675c56f",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "9bed9572ff2c400d3a98809c082610b57518f1f2",
+   "f755d35c825441c134ad8b567f9283c1037a970b",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "18cc457503e394bde209e8d129e1fc9b6880513f",
+   "240a3c7f186c06a8271ed65e4bb9a868cf24f92b",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a94c064241c245163a760a4eb65ef64ed78fba01",
+   "8d18e84cb76041841df3ca418d8c63f023c38424",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "4bc11069cb5552205f6c3aa42c5214149d422e20",
+   "38edd1b85df4ba87ddac07869eac39e9123d9a99",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "2d3bc04b7e1d40f224cb1520a0f54891b73431e8",
+   "95f4a17a2a762a1dbdd65b5a6c85899923269d6c",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "e88fef892a28d34b12550c89a72290a4c0c05b49",
+   "f80ba3759587e78087833d49cc28922a3020b9f6",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3e1ab9b59931eaeb96983cf30845b92c82b880fe",
+   "ed1b8c033be379b88933ea8c070194a9d0464ade",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "3d7ec735d6adcbfc2414d22e8255ebcdb0635b88",
+   "050eb6a3904a4dbfcbaa5bff5c4b7a04c5cee3f7",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "da884876476dbbf315ef5bcbbc17a5de0d819e67",
+   "143f3f7c87a289c9dc0c673dacbbc537b43f3a36",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "330715606adc65ab1bcf5306f4f35f8d607f147d",
+   "ffc8190298064e81a4c3bc0ef0c3627cc83375a8",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "41dc81c404a2b3061cc8d64f163ee1df8b840f49",
+   "5d8be2bd928046bc40f74a14484e1bbd2f608ae8",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "6598ba613c64830099deedbb0da78bdab40b9424",
+   "7ceb389b35b5e21b63fedd186ca8583d5c7c66ff",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ecf97d6f5d98acffee7a0562562304405ed04a22",
+   "f3f5573b7582ec9cce17345415f2df932a829451",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "327ad1571167d4687b3f2f394f164de9cdd067e7",
+   "55edfc9376002b493f8a271fc7a5d62c27748802",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "a98a8bb315a27bf7e09868743270356490a45dd1",
+   "902fa3341a1812c19d8091055333bee7993745a3",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "1674455a5d1b172713c510ca12e6edd0e1120faf",
+   "bd278695088c2cfdd5d028903cfe94f216d8114b",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "066047220a11fbf468846026cba382c8c4a829fc",
+   "331f865afb25e0066d4fa4861126931693eb0404",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "7dd5bacbc01ed1d448c818854a915738c75e7e2e",
+   "b26af2a076cdfdab3c761264efdb65452f32b7c1",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f05e57b357393eb5a9251d7b5e6010d22126d60c",
+   "0d7bdf20697948d118f95f71f69bae85e02151f6",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "371633ed2dfa9be14275e3e2c303788b8f562efe",
+   "1360edbceff54f3bfa446af531db26a377ca007c",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "d3efe04559368a4e7304bf306eec7fbf1c2125d0",
+   "2f99fa632176959bf717ef2a4eb6e3851c99d264",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e1efd9f8b894fb907df3b3e9bb26311462edf0d3",
+   "f69c1341e0992a2fc3f1306c5cc3c795395e550f",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b1548cbcd9021f5d9bb027b820eed90c45abbcaf",
+   "e7ea376cd142a551f3178e35389c9f28e83224a4",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "83ad16ec11fc6985bace7bf1f9b9ebc6f056776c",
+   "859c7267ad547066506e11518ddfac7ebcf16b1e",
    "testharness"
   ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d55fc452fbb0e9c3fbb118be6b3cedc98d67de3d",
+   "747c8e1059db4aeadb3d99fa855619e522d8b225",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "6ca3f08f728a4e58bd4e383715cad3d57d438603",
+   "9aa77a78c63ae46e9fc13923c66f3d77c1b8e7c3",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -700242,7 +700812,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "0dd755c1c1a18a7803ac244c79f5656b860801fb",
+   "0db6b0fbc2eec5daf60008dd4964cb21562202a3",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700250,7 +700820,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "143fb97db816b0e12326e43c000e7c27c668cf37",
+   "95eb256986e7a6d136f67b50618f9e350a1e7a1e",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -700258,7 +700828,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "f5d37d11e0def920c1ce3e8d99248748a4d2cf08",
+   "59de544a1c0a68ac1bf3fd62c490e905f232d6a7",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700266,7 +700836,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "9e52e01675a22edd1bbf7252e44ada98e119b91e",
+   "42dffc718dd65acb4d73bb210411e578c5be7bda",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700274,7 +700844,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "fa8842df5a4ed1723360d86e30c69d6991e3def3",
+   "a1c0ad2ecbd2a5662f2fdb5bf526ad349cc7b79a",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -700282,7 +700852,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "43dff534e2138dd75a1f73d526a14dd20a8ce980",
+   "4214ed39789ce51abfee360bbe79f4f4a796b2f6",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700290,7 +700860,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a72f47dd4ba492f3e5a14da2d9790ad391487332",
+   "c74fdf48aa7204d5d0d0b759bfabb407020cf2d2",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700298,7 +700868,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "1ff937f576732dcdee4151057039bd821e3b2fe6",
+   "d6c256cdd00de76a5b4f9e50836da6568a34a7f4",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -700306,7 +700876,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "59b7ba10708d1f8c2b65b50d9d73f575e69070dc",
+   "84f50a7242b27c3c524fc10d6ea9b95b1e86d98d",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700314,7 +700884,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3179c6ecbd5f5342d60e5547b6a420964efd18e8",
+   "a4c9484c8c0939098c6c16683f804bd568bc8320",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700322,7 +700892,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "f62209fe6e18dee2ea26119ff5939f15e4d7a095",
+   "5ff5761550074bb1beeed4e66a68bd8631c260a6",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -700330,7 +700900,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "05e2c7ea8b330b906b7ba08075f153d262f93d56",
+   "214d0a41e68e9e0757023a9a1c4c8776622a3bf8",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700338,7 +700908,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "5fbbc7e5180f7863fa3e7319ee00c077779f5d5e",
+   "21f6bd1faaa7942e3ca68592bdf753664f94eff7",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700346,7 +700916,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "8f895f658aab5048604ac69f9de9ea8f673ca51d",
+   "a7054707dc49b7f3c6b44dfc0fe977e923c35271",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -700354,7 +700924,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "b3c39fc9f3e2f11f54634ece217ae1edc407b6b3",
+   "62dbdaff92bf0a0151424bdc0183ecc123c61db9",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700362,7 +700932,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "8b06f445e85644b6171ec9ad777222348d5fba1d",
+   "3877d5bce4f2c550ab74d46be30b7636231aeaec",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700370,7 +700940,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "89b288f85ef4d014cdca80bbd742322b11ddd926",
+   "b537c0352c1ec175e407b56546b5b3c0c58010a5",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700378,7 +700948,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "dcbd51e3b90d491fc2bbacab176f9f40e6080db7",
+   "0881853070c54031398ca6fe72cc758689323e05",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700386,7 +700956,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "e4d0c83510b9ba7be7b9a0a1801707d1d8015d63",
+   "390e5a114d0444a898b9de7e778156dba96bd530",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700394,7 +700964,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "2d55efbc28d9ed7443e60e81d8b0d1147e50b99e",
+   "21ec099f4cf197b93a1c08e033bd0572922fdeee",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700402,7 +700972,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "04f886a39ebfab3e6bc0807cb2158a7086c26016",
+   "9c05e66587adada8b50ec5597f2a82d19be57a9b",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700410,7 +700980,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "fd58e4e70ab49c7dbcf082f05ddd035fa349a331",
+   "2bba3d1b95809764f91de476020b39ca0e4a716a",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700418,7 +700988,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c06869b7b8bd013d886ca4f77e88130baec5d422",
+   "4e46c27514d5dd3e28bcb830a634a8c824ba7a11",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700426,7 +700996,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "adde522b5227fae06e2b71637e78693827cd6d2b",
+   "43b78c36946e2506b47ec60d26595304a555c8c7",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700434,7 +701004,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "51d88233bfa5c20a86e53ccaaea94ec9dca6c54c",
+   "745f65c04883c123f7dd0a86e4781435888168af",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700442,7 +701012,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3e5400c007f140ce605da6d95f92ee154cf92068",
+   "e503b77b05c71dfe64fa5a874e1132e4ba367df6",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700450,7 +701020,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "1c47d057f14408f024c144837e9feda8323a2ecf",
+   "9067040bb8622050bb11aa1919251e4063e4f2bb",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700458,7 +701028,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0a8e19556a553af145ec23f028a52e11b4e45885",
+   "7b2f46326a302c1d10c304178e399773d07dc4b4",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700466,7 +701036,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0f894d0a416ad7700f0a31d6a0ecf7a612f7cdb6",
+   "e471c1fb03069882b4de35f86ac196a53dcd0f9b",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700474,7 +701044,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "7df421d68a11c13290da2487f543f2a3b009ff1e",
+   "dda3d2fb493e73e2541f012c4af51550d59b9bd2",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700482,7 +701052,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "65a0315226d09368a1d0a96c7f8e3f04f607b64b",
+   "5e3c7911cd73b6066983927852d0eb328161e305",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700490,7 +701060,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "5f39f8933c6a29b26aa079c0d143f4d320e9c9b4",
+   "3449a347dca51f652a994af3db05e877f705f2ac",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -700498,7 +701068,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "9b405a8ff746de6e33a7436f7cf583b780b17a53",
+   "d68b3f0d60b9f137047dfbc48af0e6f9a09ae61f",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700506,7 +701076,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "d84c7f5904c6dee321e66f5cd02ac7773df24b11",
+   "0d32296e8fd1391e1223d9315efdc21d30935a5c",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -700514,7 +701084,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "207eb95f8bc35b95dfff71d66b15a4165fad8fed",
+   "e0fe2ed9ecaab4378e4309328283c655af085ccf",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700522,7 +701092,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "c371de93ab0802836004e7b8652a5c08fb039cfa",
+   "5a66aa2ca700aecaec7fc41b9546e71987d829d8",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700530,7 +701100,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "a76bc5841c976c01cdb731db3dc6a1ab76780d70",
+   "228473d37a404376a6dcc5e5e8fe12b6ae4798c7",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -700538,7 +701108,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "0bf104829d7971ff968c121cb7e1d96643ed6635",
+   "556a260ea63ccb66e1f2bec2faab32f8ce50c0b6",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700546,7 +701116,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "24900cd3ba8834bf989deeaa7fec224f9e73f0c4",
+   "e9f49f4ed9a67a4a7d0a96cd9daceea6367c95ee",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700554,7 +701124,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "3da8fda74a489d83c691db83c9dbc7824bd4dd00",
+   "e225adb44b66f6a1d43c8d1015cfd68e92ef2c14",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -700562,7 +701132,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "3c95f29026225338846dea9bc0192cd4523a6dff",
+   "a2a97e73d1e6481ef87ad68d7e8d7a2742f0a1ec",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700570,7 +701140,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "52b7fd3c93bfc849977272b030e0771d63f062aa",
+   "eae326f66c1a7127351a8efd952e4a5a1cf622d3",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700578,7 +701148,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "5b417f5fa0e6a80114fef8d9e79a307a1b0f28a9",
+   "870b555c7b4a90c539871ca723223fe7dbcbed18",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.headers": [
@@ -700586,7 +701156,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "e3cada3c95caf310d540da8e77910bdb458ca3d2",
+   "92186b3831859d4790934a416d90969e276cdb03",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700594,7 +701164,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "9c2223229a88ab87b5e64be84ab924a101fe7e20",
+   "924ebe5e76c09cc21653daa2aad2761424feb3af",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html.headers": [
@@ -700602,7 +701172,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "956f83b91ed00e2489d45cc259a997f110c07d1d",
+   "8e374ad73ae7a89a638277ec6673fbaec28c5f49",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700610,7 +701180,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "9c90fc295cdcacafbb80ddbf0aa347aeed475d86",
+   "698ba1f52dcf16df370f74479624d6ecbb2485cd",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700618,7 +701188,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "7b605a64df466ab996206d40d200bccb18dca77d",
+   "c3eead4ac0ceb0a2447734d52365928daeb949fa",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.headers": [
@@ -700626,7 +701196,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "e58d778fe17b7371ac74274fb47f8e07a6e9772c",
+   "b1c1f720a14e75c34fe82b3fd647241f86ad3137",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700634,7 +701204,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "c39673a685cc7cbc231d5b42fdbcc79662ceee56",
+   "f0082510aaf9867fb2b4d4f36a5a00f9a4107553",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -700642,7 +701212,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "39b3d4d5a03a07cdd8b81ffa1fd77177e54bae3d",
+   "dbb8da1e03c956fbaed72688e090e80d3bc33ff9",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700650,7 +701220,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "2b1537c99d04ba93b0b69492ea5bff25c33e9baf",
+   "09aeb8fc143e6d5df4fbf362dc07db6c1e4f25e1",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html.headers": [
@@ -700658,7 +701228,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "b7fc76ffab3ac5a333a551f18761420f3ee541fa",
+   "e2f73ada79c33932dc87aee17a81deceb1ff2e56",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html.headers": [
@@ -700666,7 +701236,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "42b67db7bb0b3aa2911f8ab6ebf5e6ff0eadb57b",
+   "fb86bc5c45fa86aea0caa61611cc63dadabfea7d",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700674,7 +701244,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "575ad28f89a413ded49a50a051cc0f9e98aeefc7",
+   "637f7d801961f4351d3eeb0a92b498007ff766d3",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700682,7 +701252,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "d14b0b5a3770c8678beb8809f31d73410fe2c4e6",
+   "649574394f1259b62aa93c5eb7d376009a4f3111",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700690,7 +701260,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "80052e293d9c78c128a6dc6274fea9c89c7e7177",
+   "1bb79c1f38afa280cd1193734bfdcca3f63938bd",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700698,7 +701268,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "b797c7167ed5b45cc6331a4660e7d124256d9bbd",
+   "a9053cc0649c374c5c00dfc830ede7c2627a4dfe",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700706,7 +701276,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "e3e35115f519c672f0fcc19534c00a79e28ae84a",
+   "c7536fc50807828021f58f58fcdb94b0baab4848",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700714,7 +701284,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "34ee1e680a92bd6a314c72805fa2bfc7eb22f29b",
+   "b27ed1830b6174ff7f372485c48bb866eb4a26c8",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700722,7 +701292,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "ce2a8629bdc6ee0b200a8882fabf19ff2e923a5d",
+   "39a7b701c33ef86a4ef2c8843654032132469828",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700730,7 +701300,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "ba28809961e24d22f46a27b7e5eb3f54ad09ef61",
+   "27f637f8447dde6cd24378d3e0799876e8d79241",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700738,7 +701308,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "137aa0a469afcc1e742f9439bbabfd844bd877f9",
+   "3c11a22da1c4e7c3eacddde233b7b763701bc550",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700746,7 +701316,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "dbde2fcde46aaf0b7837369c164d95e78f4915af",
+   "b02da368869d034ed36e33d9b33dfc427bf02522",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700754,7 +701324,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "2e43ff0392c7b500603e5cf87cefafedbfac66c0",
+   "5f542a4c16c40e41e9de08b57c7408ceeeaea293",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700762,7 +701332,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "09f4fd3dac1b2cc3517feddc23e37f219480b147",
+   "a5a9a71c2d1293d883bd75fbb4a7d695b3f772f1",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700770,7 +701340,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "5e664817c57e5f845ad5f324c42dcdd44943b0db",
+   "be363d79516178fa0509bae76c473f7db17a9bcd",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700778,7 +701348,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "5f0426410b5b3e0a447b7129f1ef0d289e4321ae",
+   "04e317062aa1218243689421a31560faf5caf47a",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html.headers": [
@@ -700786,7 +701356,7 @@
    "support"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "a70b6773a5b02a9676c11757998a264e19c2dc4d",
+   "3504c73637c8136b79126efd6aa90883e42c2b31",
    "testharness"
   ],
   "referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html.headers": [
@@ -700794,447 +701364,447 @@
    "support"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "27cf99180481284055903b98452e3b60ca4e31e3",
+   "597f4092c2f3160e82176f549fb8507c13b7eb17",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "4bed5f9bf755d4c73e728e98bb04c2451bc3d466",
+   "2177b2407fbb4483669380b6a65ade6903d381c2",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "1e0ecb22618e16c9b9e05d1912a5c2018a5aabfc",
+   "54b2947dc663bd502e8e6f14bf776705dfbee644",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "637e63db7a4b3958716b185ab4e39a4d0c5d3118",
+   "94f10a8e9de329b47ef0aa8697d2b2d45c0644be",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "a77135960229512036c76d53a11f9d2ca5e0b827",
+   "9463f5394adc5383a4794cabce68d5141838827b",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "84d8cb7780da0ace05526b97603f937534d1135b",
+   "3838698b0a80061e9b32c520cc75e502ec06aca8",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "2283585fa4504cb6f11ad2d5ee3170ce9daebf9e",
+   "5a1df9c256b35011c07d43587e2dab8a5bbcf218",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3786e3c2ee2cdc84767e6fce93c67d70e87ce87b",
+   "0fc489100e8d6d74055f7e91e7eca68ffc8318bf",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "c87dad26607855003ea0f7c9eea4437444865901",
+   "0028b48d0b7e97f404b3c532864d01671d709286",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d7c00a2cbe0e63dfec0aa8fecf2f6cc76d6acc0e",
+   "8b2dea1cb62f4d5fd0dfdbe22617e9a9997a4046",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "bdddd53ee04f1eab9d8ecd471e131cf8388d6ee7",
+   "71a0b692afbbb185d6710872ef178de5987c6135",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "6f51fe1845eac63e1c62d1f08e05a201f765a637",
+   "48861eb9bb785ed17c38fd4c52c5979d197b702a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e30392e0f9676cf5ca8efe0436d44938e48d4fa5",
+   "c63d9a1608c133f0ab7b0556d4ed4d254b2c7438",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "79ac18fb22f61ae21316c8c3a3a3b520b85da1ff",
+   "e2143e1a32037aca1eb75e166eff3e2b73f36f36",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "7146324b3177b31555e52f04135b9dfa4b5d76d1",
+   "b8d84f7726cd1e40545a377fe0affe4f2be5e7c6",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "20250b21f83d2ede522ba8681ac79860674995bb",
+   "4f36a9cb35765d01bccae61046ba0c77bf6e68f6",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "c7bac19efea42b124837a009e103c368bd0419fd",
+   "c43e52e9dfb1b4301b6d275836c44aa5af0dbb8e",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "72e3f0005bf9a1ff7afb6d49187a12d6ed05d814",
+   "8edd239db2f7622347fd03c635ba5874efb5a553",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "b11b48f2b70a9b3f7a3d9a759cbc099e9fad3778",
+   "873b26a46eb6da2648a7aa64e4a5a094cfa68f96",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d1fbc24032219a7f6d6369fb7eb05e7775795c2b",
+   "f0d5c81eca2a4821352a66413f99725c4a000104",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "79161c901ff7acf38a88317dc87bd1e78a8201f3",
+   "c985a4045448d0fa601b84040be702c1cec8e3ee",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "2284e99ec7eb4ac3b12a4d3666bb7f41166b12b0",
+   "9881576a69bd2a3853a1a4c120d55e3e3bddacd4",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "532ff5f00cd93a54b9e73e12e907c74cf8a784bd",
+   "203c5e73cbedd6f95b3afd8ea8a113ecd23717a2",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "9f98c01798470bb02fc39112782e4044c3d3118a",
+   "41025c58578ab4aad59c0173077e560d0269f193",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "e7c6aba435273769daadff5166b314204bb7588a",
+   "ada714dcc5088fd580daf2b5cc12e5a71233d7a7",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "c6acd2b5dea91c16d3fc1aeaf19afd618de04e4f",
+   "a574b1304117a6caeea002855820764dbbca9d45",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "de84f49ced1f186af2402e08e43d793693e21fd8",
+   "20a3252bf2ff47dc3d8420618259cf819a1a0f29",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "42190ffdb981a2fe004b38fb74c0f3b760501d95",
+   "d48173ffeccb3c1d43e6ff057b8c5c7ec575bcc3",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "1396c3194bdffa7575801c0650b1990ba741dff6",
+   "c5a1548b12dbeb0a6c20b954058e82aed432d08b",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "14869d14cda5140616d2224a0b96fffb1118f6b0",
+   "0ee367c9316bc5bc49ede92b77140f923a6c4128",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "a332aaaca379be71dbcc4b6595123231706470d5",
+   "3e6c3a175f1a8281ba7af4aa42ff0f8fe07ce145",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f5b44c6dff9fd01a255b4adc6fa3842a38e78f5b",
+   "533a22a72414151feda1aa621ed9c4e2dda02fd3",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "9c85284827fa0bf6016bc74171db1915dfdf19e3",
+   "335ff468d905ee397358dc7caab8dff492ce164f",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "1ed6966d7c393d91240a682504f0c76ec134835f",
+   "32aab01443482fbcb3e450f68b80e5d6fabd22b3",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "33d854839309e221c5177e4b054730167c704ec0",
+   "a92d87e2782fcfe6b39cc7826055ed956a80bab7",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "b6d350279652ee80325afe6f93244439513f5690",
+   "6f9417785ff9e3b4f7bc0359f26b534b44dc5bae",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "bceda6b62223f1bd7498bff89e315b205be91392",
+   "ad8d9e7f1901d4e04d4166cd1ff37016f1260b38",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "e4452e8889f5226f4b64712bfb04c13a2ef23351",
+   "a218fb4980df724234814766a59eae7b8bfabad0",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "5ec40bf6127e745c6d3f72732f53d3e0ab40d62e",
+   "f3fed6c88b8da176db1c51208c2bb4eddb33b2e0",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3f20ecde7d3075347d8fbc13e6b4ab383a9b939d",
+   "3675e2391e4e72c154db32767af24039b396b70d",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "bec41c1ee0445e6102b162f33b5c17779b2445e2",
+   "a94bdfa5d530d9916519262cb89aef7a1e82626a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "5751b140f3946d886f765ee20b850edb19a88833",
+   "623f6a6e81aa33df2fb6d12a7df7bcb353c91c99",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "63efc923d64d52bd4aa3439131b7b30a03018a3d",
+   "a991f0c67578b92097dbde29f508336196fd6380",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "f6514637935551ed8804d68ac253c5b550c87e97",
+   "1546f57a7df782c749d7fdb0c7775f73f1bfb04f",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "8631f9768b7bebb6ba93c0cfc8f88b81d69d08d4",
+   "3877c0cbaa250e29e6408f369fe638265ec94213",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "9012a8b3b7ba7693497c2eda125aea41eb0b4b66",
+   "8542943aabe20b6df7979e467ed86519b0351aff",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "34dcb856a527b38b5398b7b669ee99418ac75c33",
+   "f688eda4732690360b8dc44ea6a2d0c227b3026a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "ead01d683637c56a4442b7faf337281c730a9dae",
+   "aefc8786e2c2abef050f2a19ff4a5f44214f1d0a",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "2ded70b2f4ce2f3cb17fed8d8c27b3ef216bf7af",
+   "107e1ca1a6701ee92c5d12019e7b99dfff4d6774",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "0807c9cf5cca05c21e50049a5e958ed48d3d21eb",
+   "2b4472d3554859a7a89dfb385520e2579493a752",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "43d514d8d01919c9505484667b684069256a4be4",
+   "5889d9e90f272193f08f953e754d3d0bfa4391eb",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "f96c2bc5b76575c06905a814d9e08aa36b787571",
+   "2edd19df54f2ba7ec289f473370a740acf9614b8",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "8f24883a35aa01f876a403c14cba48ad64bf294b",
+   "418e84a8210e0bf490396dbfadba00e600fa3a7e",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "f8cef232a872463d3bc9c7b353d7e352a7113f62",
+   "d46cf842c631c894a8ecbc2ce7db778fd8376bc4",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "ae72d6df240947218135acde5d93b9e4eab2b5e7",
+   "0e40587a04020bb8526448e5649b5ff179b612c2",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6ba8d5034280a683048e7392dc7af93baeafcfb7",
+   "538500ad734f51dbfae7bcc300a48298d91319e9",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "2a1c02fbfe7f17f4b100fd060cdafcef4d2c855c",
+   "58da77e1a2916fa04f1dfddee6564088c4e1bcd5",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5d2f1ca9e6becfe44f2b27db324bcbf7a88ba473",
+   "85dab619c2b1a7ff169112c059b44f1537483b24",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "8c9214bcb262f3a17fc0f6280a3d17a8d596d47e",
+   "92c2b51d15e244d1d223003aadff7582377ac3c5",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "88ef542d16304a6225f7231b48109c1c56cdb26d",
+   "b981865251345b348203274fada1441c63a4f96c",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ff9fc6dfda648a0384b127d184d4a7d70a5e4752",
+   "20f21df56570969cae0ca0c31382690cda733f06",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d009ad41b82cda3eaabcd30fb7dc932ecda3d33f",
+   "7c597fbcec5ff35babb6219d5a22be50857cbee4",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "56f21b478cdb184e80ce8455d4ae495e9713e247",
+   "7ba85fb790c517f3223183557921082709f6c38c",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "8bbeb71b993a046e72d8ce82eacc06b87130be57",
+   "fe6b2b59b8b58304d4815fc6340b099e9177872c",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "0dcdd09671c9df91640abd9ad9f16c290b40f586",
+   "7cb4aaf09436063880bfaa8c1c44ef5e11310b9e",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "e5f30e2116e6819a405db16c7627289744776477",
+   "e7caa27315667953491e6ad620beffcbdcb6eeb8",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ffe6cfd0fd869584dceb48f91e4c503d14642ceb",
+   "b0fc558d76ed8501d84ea42503f9989a8e0ebf09",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3bc89e8aa804f25baaaa031bf642d6646520017b",
+   "bac4c36dfe5aa33de300d637276d9314684d8e54",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "fa5f9600d59c5500f7ccd763cd1b07deb83e3569",
+   "0d76c92864d6f4530210aaf8096d67184c4671e4",
    "testharness"
   ],
   "referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5523b92f215b9cb521255a93e7f7a10706de45c0",
+   "2b24a45ec52ba19f4bb4a9d30398edbd251a4241",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "2c091a190912c958cc3e2d25e25aae4178ab06e5",
+   "00587b4f18a6afa814740c3148d671600e243089",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "cafe70e7b5c3d16650fcd941b83b023fce3c3608",
+   "3bcc6e82a70198f0c397cf2968feda346dda175d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "571ecb99fb96890d3109ef9a655b777c93f51c41",
+   "387a0b3e6d5d9412f4c00139675f6c6937a7d59b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "59d593788aa5a0e2c4a960d19e1bdac721754039",
+   "e19734a542ae759c235549e55badf0fb64a8da11",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "a9ca0f209d5d48c5dfadbbba403d36ebc16b2527",
+   "72eef24fef5e9131501a0959a1088053fbc6e278",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "02ea40247df096bbe4948b00dd0e25869902f351",
+   "c789cf6d302b2e1acdee5cad196950f7f603037d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "a8376076e9ec60904f2fd69c59d36752362f3981",
+   "a24af8beb2dbb79316b79e07e9184c14e99c3328",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "02d24f43981e611c71afa6900a793238bffad393",
+   "a2773bfb160e4e998c5ea08e28c9824f151df2ad",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "a57cf27cb9dedb04901dea900469937685affe46",
+   "72cedc5e35c5c1a6c0eed922de72b743276b5850",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "2fde9f85ca8fc66e252e7d7863c4dac742a4531f",
+   "612d7b36280cdec928734d007dd7d853a52cf5eb",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "1f464c6511545842cbae461cc47a3f46e3191eb2",
+   "dca3d06299409aa44d3a8fe98b82875c7702754d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "fbbefcfc32785b8a4fd5955f32281771502ec5e2",
+   "2c5328ff25e68f4c362dee910453e7ec7323f010",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "5f476997226de54215139b9e9c8933cd205632e6",
+   "54dab293d80e500094aebe896ffed492dfefa96e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "dec87409692bd7102749f4fbcc5387dc7b9cb1f7",
+   "9899e2f4e6b7ebb7b9b8d1afc7266ed50384150c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "d0ee8283b494464fcf7b16491109359bc8e984f4",
+   "98a55358c7e8056157192bd994daeb8c95917f9b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "3d7deb5d6909c27fe6fb37d7ab00439ea1af71fa",
+   "d5843c83a955cb9a14621405ec77fd8620aba947",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "1e1d7cc7d060d59324455877b310e30b5092ce29",
+   "f7d63a639ef29924cbdbab9f6f173365f2f0ec7b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "2ff7491aa449b08b3aae02d10819cf1971cb45b0",
+   "bcf8f70bbf774bf7240314da1fdcd8d24c059782",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "b669e643b2df28d5766a194aa8a756565fb6ae6c",
+   "eca04d52b0274beed7eed501809302e08c2ea166",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "96297ef373a5bc095f0cad20977e07d176d3cae1",
+   "91d7ac0ab4d93b9445de7382c8ea0a7958ace19d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "fc280d887a71a851d5181b6c3fd743964c06fbbe",
+   "72eed78e5a241f9f6548f55812e8335fa723d784",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "4f41d3a9b3a24b3b3188e49349fcfb50aa3fd4c5",
+   "7a45e12f4f8facecbf19ccc1b9735e04ba5f4ac8",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "5e1fd3ad0720668a4d60b601c2afc6aba851ff1d",
+   "5facb852896e54c8c399d47b72dc7a914e576ea5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "091e47be9ab842e2121f7810a83babc16bc42bb9",
+   "8ed4f6340056660fd25a65396d69504d4c314601",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "2ac8da1378e844842ba8e0ed2f274ee209c94831",
+   "70403fe53654d6a931f70fa05cf441e2cc574c8f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "9b861d9028fa13abbed687f33b86847cf476ce67",
+   "32dacf7ffdcd6994549e01d73bf5db33a51f72d2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "6873ffaeca9a311582b4dfa3cb0a864d7e47c681",
+   "433f51b14312f8de24d1c81041330a9f3dfb894c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "362df9ada7251a6a1e6f865703b9f28d3450e6b3",
+   "b23ffd4b8e2ca1ccb78229d9f96a20c47b288ce4",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "2e89b249fa0458039a5a38a8002beab38bd7a8a5",
+   "08f7d0928944cff07ec99f6133f2b2b8bfc058b9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "7ea56f60dfdf5bd5bc6bf4a099e5283270d776f1",
+   "f5bec43c8b225ba84858532dce2336d7c09d6854",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "dee2d6d4912350c3783fb769064adb45105b6ad3",
+   "c1d52ddb51465285fd9b8d4099f3add98930ad47",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "d72a6fa952e6d50f6ea40e491a5b47bb453a8a9c",
+   "5225f28f85073b1733fe5f895dbce696ca2fd4dc",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "2f5f1cd7f4d08bddbf5b0572cb99402b1ed9eae6",
+   "e17dbf9ef6a512a37a93a0795686da06b0111ecc",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "be9327362f2f63d12d4fe022a7c0d3b1f3e3033a",
+   "613eac440b5089f3375c9b1f542115d75ef34ba6",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "b1156ca958d977cc2263496958a3a81717335b75",
+   "dfc5328013a50d133a51e8036cecf782f7460840",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "8f6459a49fb173503d6a21e5c566dc3083a13f01",
+   "ea9605e8169f523a8ceb8bcb107aec2a4147888a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "72d2fea16c104f914e27a0c3af9aa554c94adc42",
+   "8b5e5cd9c0c39cf22d18ae05170c66e42afdfa43",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "4bf19c93d71dc38911cffbf42d53acac87e2e202",
+   "0913d31a24f697fb415b9f3613689313672cd9e5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "667a01425b513551398f6acabe47a9cf8e339693",
+   "2b06a9ab2a2c2137c8e5dff00176abb96c3f9923",
    "testharness"
   ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "3ac4b60555ee73cf253773e2bcb9c832919ef646",
+   "d8375c93426751069de86076316f9d9eba38e89c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "44d2d7ff53196946fc5350e1f2943f3b9757cd7d",
+   "3353f70740458abee966085e45f14bc359db7e97",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -701242,7 +701812,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "2f27941d33e9e695c652723a01f2ba1ff2f6adc5",
+   "a82cc859c33540e41ca22c8eafc53f65f7aade52",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701250,7 +701820,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "b75f8d3c179698cce1058245809bb65c28c382ad",
+   "8f57b3335ac4e61b746c644cb99d69a8368c22b5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -701258,7 +701828,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "86c2a31212afeda5da53531de04b7d8e5ffa0bb2",
+   "3991c32409051280eb6872e6d5b8096684a7950e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -701266,7 +701836,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "ab9d5a2b9345001699b69ebc9cf958e0fdbcbd36",
+   "f61537ab2b70efc119200110aff69a24e2af7908",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701274,7 +701844,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "d421be327aabe7a5ab28936fc07fce1873e03715",
+   "5dfb2f8a164bfe75de3d238b4d344e2f98276270",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -701282,7 +701852,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "82624d67db7a50c0d81e6f2828350dbdd3497d2d",
+   "50010aaeafa64ed2cd7567aa5532a40762851717",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701290,7 +701860,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "d95033271162feab2a69a78762965c8411ebfe42",
+   "d17712e1d17c1b41aeb9d873519e19bce0625432",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701298,7 +701868,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "2de08cf93e001f943430542a60d57302d3712901",
+   "e514cb738d34b5c4dc79b50c65ea565f65f47bf2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -701306,7 +701876,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "b19e9c6373609e9492818742a37d78c252ea836f",
+   "679128d15f36f122b735acc80c92e22d3d0baa62",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701314,7 +701884,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "70cdab12318c0d4aae26d6c2ecae1ecccdd2e56e",
+   "8afd60eabca0155acea7da94424a8164627599c1",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701322,7 +701892,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "896cb0ffe37b0f55b802ede42d32cfc15925b6cd",
+   "f63430fde9102bbf11cbbef92033281a3fd6c147",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -701330,7 +701900,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "baa966698e3ddeb6db0c50897d5fd973bd120de7",
+   "6f78f7ab5819fc1a208719d8861868b1725e41d2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701338,7 +701908,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "3c8d120751a77a5403cdd65334f9f8b770092b80",
+   "10fca8ad729e90f341442f9614f1cab0f4dfbab9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701346,7 +701916,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "410b00d95aeef7f595f01f72dbd8df889d30f265",
+   "f60d3ed06cc7a0676929af913b05eb4c0b2af50b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -701354,7 +701924,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "f469e2034ebceca6450d96a682048d4a657570f5",
+   "44b1b21a711425a8f4e41ce71f61f73bce7b55a7",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -701362,7 +701932,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "cb5137b71100306fa3151a6cd476423c83fdf845",
+   "8d9b118d13f191029583b60fe6802cd75839ebb1",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -701370,7 +701940,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "756fe3d4128940687985d1913a22a3e76a80ddf3",
+   "e9349686169f71c8ef58772f6b1737b984906380",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701378,7 +701948,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "b7651581b8ee3526289928aa7e176a2f798785b7",
+   "894676e8544403970deeea77b1166630ed39c299",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -701386,7 +701956,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "ce86369596dc96b4ec7c141f0d9882e64d84982c",
+   "42b84b215082796fc31d3c74c9720ed4f4f5dd5a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -701394,7 +701964,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "f1d12065c07b93144728a815054c18ed107fc843",
+   "9383af1ee7125da47f43386a4687a0185de4db0f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701402,7 +701972,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "9f7a47c8262fd3e4df401c0006191a9d4d958076",
+   "03c22def281bc77e76be4dfdd426319f90a518b4",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -701410,7 +701980,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "ec2dff0e84206f8fc55968b0617d09f729607e40",
+   "f14ea6703b3a262de9edd0af6e0a5331b985a5d5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701418,7 +701988,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "4dd8bd2b860075faa8f6d9de5773066f5b0103f2",
+   "de791441ea7112958d98f2a7d1220ab9bc219cae",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701426,7 +701996,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "edb482fbc03147a19edc3a251ccc858f0ca7fc3d",
+   "83707cdee070a4b9715538062e3a76ea3f53dac0",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -701434,7 +702004,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "1d631cfd83a81b84f437b5c83a53aae12b598ddb",
+   "2b92b33df18021e647ec87fd728551097e4320fd",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701442,7 +702012,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "d6cfd058bc42b19a3917c59bb65fa7b1d36c22ff",
+   "142267bd452512c72bc26ac8fe3200ea53e1a3c4",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701450,7 +702020,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "ff8a7f68c5b442426fce6b1cef93a4bfec8cafb8",
+   "738f5c34adee16cc22129897ebf2486653a96dd6",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -701458,7 +702028,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "0c6165860da2e1b9e543dea80d2c86a2d681ec3e",
+   "a3be0469c9f0446baa2e86671b6336c0bbf77c3d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701466,7 +702036,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "1ab7f58d7974d0c7ba1c4eca8401b97c1e678ecb",
+   "29ac25d14a1251e6120e5983da6fbd54a8e95ebd",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701474,7 +702044,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "9e850de0579b69ed65c27abdabd5107232317f02",
+   "3a95f9f42b879e76901f0cace304ec5a66e9c088",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -701482,7 +702052,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "41f079689465137f464b5a7f8e626b290a4663c0",
+   "177abec135b2f59ad53257466d465167a67fd5a9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -701490,7 +702060,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "1f93d7f0e4739cf854ab36469d8e673d6f4369a5",
+   "8dace8330263e75529ad1f94b4752c024a9c1488",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.headers": [
@@ -701498,7 +702068,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "178cb8b1e259c4d0807659875dd28797964e3c0b",
+   "5ba49e0acdd46d27221ea7a25a9b11fbf28e8032",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701506,7 +702076,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "037b8e9498af76579c9cec062c4861693e9b540f",
+   "4bff34e02c947b0b9eeb6069556afac3bcce98c5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html.headers": [
@@ -701514,7 +702084,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "f4b3de94b4d8df85f2b06d3086377b4dbd9571c1",
+   "fa58ac157f2a69445a9d99ad22faf45e22a782c8",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -701522,7 +702092,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "f690596c58b2435e247d0bffb46a2c4744140fd9",
+   "4cf2262dab7ef7873a78e86d211335e5f06862aa",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701530,7 +702100,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "42e366cb1d82c828eb2252a0b8a04f4f286bf61a",
+   "aedf67b946b677d8e7b5fb970ee0fd0a13bbe8bd",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -701538,7 +702108,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "2b53b402bc3cda13412fb690ca224ff2a88cae4a",
+   "4181c8a875f9551ae91075adb547f6aa710d9869",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701546,7 +702116,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "13af9b92e47a21de507dd9ed19ba17f4bdb9fe8d",
+   "dc6f090b51b946b6a6aca2bfd25b8772391adcef",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701554,7 +702124,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "5eacfc71bebefb79a52384b82fdbb9c0f504ed6c",
+   "22d449d42f4fbbc324612cbdc948475acfd1f0a9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.headers": [
@@ -701562,7 +702132,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "3d5a0f56fbd2a1e9b5fba183a350225595159341",
+   "1492be672bfb13df313e3d87cb50712cb62bf63d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701570,7 +702140,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "aefaa47a7f94e6057397c8069c9f2a6f3fe9fc84",
+   "c35639823ec90d0c9b0b00e96ca86592214b0999",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -701578,7 +702148,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "3443749f66b7ef8782b0b511e2cb4d7173f15ee8",
+   "bc5f3bc3e9429d6c07b3bb15585c97184772874d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html.headers": [
@@ -701586,7 +702156,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "9fd91229678f78376d0bb6bb9d6dcbcefacb1161",
+   "c458763f10e926c7640b78235c35654fbe382097",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701594,7 +702164,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "3250c6e5192590adaaff533c6baa07eefbbc7f7d",
+   "00e1d936324fe7fd05988d17df302d8c1825e895",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html.headers": [
@@ -701602,7 +702172,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "cc0a5b952b36fc4194609655552540a03e963be3",
+   "c17379cfad0992c0498ad1653fd6ddea1f17ba2d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701610,7 +702180,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "d18028876a33aada661ba3a0443d4dd4ecbd71d0",
+   "faca9b10f8728ddb4add24628b39a1f469539274",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.headers": [
@@ -701618,7 +702188,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "44f058b9c8fa21e2124dcb0f6d58c7628474e540",
+   "b0c9e254228d35a30909b1a51df165e6f14e7cd7",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.headers": [
@@ -701626,7 +702196,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "46bcf18943b67a70ae2b914046b9b01c983573ae",
+   "ec8d76fc0c92adb52c2a19a6683e7a1fc8ff8286",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701634,7 +702204,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "7dc7b6247abc28f014d08fb2ec8728a1406c4161",
+   "3334b1aba363f4640686fc2baa665a32897c432f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html.headers": [
@@ -701642,7 +702212,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "71c77a981e02a865c1246e5456c65ee6b8cb549d",
+   "cf19b751ec82501464de5d1736a868584dafdf73",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701650,7 +702220,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "da2e9749c62587a2786834990566629177192b26",
+   "4c44cbce0d9503a62143997a9b82f521e6073aea",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html.headers": [
@@ -701658,7 +702228,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "78a52999a02bd434c204cc34246e63045a1db3a3",
+   "61889e61f9568b2212baaf2a51de85c1dcef74dc",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -701666,7 +702236,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "728c0b9fe40e071d8f52f61778ac8c06486dbee5",
+   "1a03c3d9dde8b3ce49bc03e41116eff54cba3179",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.headers": [
@@ -701674,7 +702244,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "b01056a592809b7b43e2f31d116b0351ea9e6a85",
+   "35f3e69127d36b94afb1c3c7d2fd2fa5434a3fbf",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701682,7 +702252,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "724609f91496cb436b71c68a4411a85c1a367b33",
+   "9cc15eb4b9094c415b4a975b995d2b342fb8191a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html.headers": [
@@ -701690,7 +702260,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "3cdffe67ffe44218287be5dd3874e3be46691bd7",
+   "dc5ffbd5de6f8736a2b33b6dea0a8ace8a95ecad",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html.headers": [
@@ -701698,7 +702268,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "f1575cb70fa4b02a739db6cd291eb54f3d2b6149",
+   "2ac2803d0ed16688731e75846de880a19e17c381",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701706,7 +702276,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "796a330f30f60203f2727596d0297b62597ab10f",
+   "5b22bbc5dce1625f0193d885cd883d49008253e6",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.headers": [
@@ -701714,7 +702284,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "131c10be9be5231b61bf72698031e6f1fc3ea86b",
+   "125d2fb6c3d973700747ac561e9976d130b75776",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701722,7 +702292,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "912467477e8794e70b077982d919d0965dda1179",
+   "bf9143c2874d43dc97ac480ad1a84d8f1df7177e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701730,7 +702300,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "b3412f7d80c7a6294b503c628eeb1849854e041b",
+   "bdb66972d4a40bf141c8c144318c427c0f0e384a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.headers": [
@@ -701738,7 +702308,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "be489bfddcda87204229ab878a34101f6cfbf437",
+   "8aaeb88417742966b5a6083f9049f1efd2d5631b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701746,7 +702316,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "8408e1537da438e63406661a4fdcbc9abdf1e4af",
+   "ff3cd97f49769e920a7798aa73b42aaa3b6ff12b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.headers": [
@@ -701754,7 +702324,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "46eabada371a0368b94059a17d159df2cd3f8159",
+   "3f38a8a242db2d113c62da3c0777fda1eef0ed5a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html.headers": [
@@ -701762,7 +702332,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "b78455112a969134f65607c3208784b77f6ab045",
+   "b1d13cdf89decd7791f7b26e009b739949384067",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.headers": [
@@ -701770,7 +702340,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "cb1a94b86803da77dfd715ccce178077830ecdfe",
+   "6e02ec75c7de9e4738de83846b59d2d5739f3542",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html.headers": [
@@ -701778,7 +702348,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "12e87e0847ab18c8870bf2bd8c2d229b85847580",
+   "dbba2048bacb0cb0078d9a5bfc2bc3b6db08c3f2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html.headers": [
@@ -701786,7 +702356,7 @@
    "support"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "d09ea914be876a48231d41da3edabf641bfe6c41",
+   "f945a1d0c8351cd04ebf5740c9df3f6f56b150ee",
    "testharness"
   ],
   "referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html.headers": [
@@ -701794,1003 +702364,1003 @@
    "support"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "a20cea74b25f0b100bdb90860d78620fea58f94c",
+   "1ed2a0198cad438b552305cd54f77223249a2002",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "586afb4acefd8db81c21481d03090821f1ae656b",
+   "ba120250e9416c4bf6eac7a63065fd3c90c6a42b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "292fe3a636cb8208b9e372e9eb4f185271a2a88b",
+   "4652268659864706fc4e4b18436b1dfd4fd8e22e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "1483bebbdc9cafc1db3c11a5c193cbc3b0847727",
+   "0c7c8484a4e916db57274e66ee21cdb1aa8791d9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "17a4a30a9bafd2360321f5b2dc0c53b571ed4a53",
+   "d6b47ccbd360ff099a755bbff274957556ee0c79",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "b699abdddbd522bcd937e8a5e7c10b95653b0769",
+   "96e137e4112fe17cba492d553a8897045ea8a142",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "bbc37575bd90eed313ab21d32b19d01f4cf7e539",
+   "06ba58084f3f45c209e4c48ad30050e7b0b0add1",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "89c51bc9f0386be3fd224ee269c44bf4dac1cb3c",
+   "cc71a6ca6896b0ed81f30adb0d0c1408631915eb",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "3268adea80bf81728f96c010dbc959373d7285f2",
+   "18fa571fbf2d6b44cf6ff96096a5cc9bc6df8bf5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "54b5692df97d8c6c3843af6d8f92dd1663171a2f",
+   "bbfd11f31feff89a66282043d560743696219b77",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "6f196270e9e045d1ad8992dc5a4533100a48fb5e",
+   "d54694fb1eda6aba635677692b7de3bc72098d2a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "eb060a8bbe422eab7a6c5a737283e98fdb92e892",
+   "6e1a080f9cb98653c77bf9c8b045b8d4f780d958",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "b1254a01895175a07a6bb682bfb295b239e4d331",
+   "6343373d16a75650431a4e082aa37f3238a2d955",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "4824a3a1725445b7b0761c2fc3916d350df06866",
+   "5659e1f17fdb9d561e3aea3edb0677f8027e4e10",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "853cf0f639ea21d2b66aab840fe8a069a32d7511",
+   "bf32a5b6b59311f3ec32f977c614b446c45f3186",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "6a15feb308b5d0830176910df4d66c875b707dcc",
+   "59919b70ecd39a489523c49cf14e01c3bb14385b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "d83a1411362dd220359ff84acd6bae321afa2b75",
+   "7b81605b86fcc1cd058c34446d2b92f0ff29d09d",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "8f5f30e65a4fbc2467c4bf93be68a73f60bf18e6",
+   "4a3370369644036e4ce16bd40ed182489f16f922",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "4eda9b843ebb263b1184ca0b13343447a5435d9c",
+   "d767da3fd7bf8ca76db18353170c9ba96424637b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "f8a8c2235b5ed8d9ad4af1280febdd7da26949c0",
+   "a119bd26f512f6c7ec14b669bce130667095eeb7",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "1c120f031747c2c2bf9dcc09b7f6b4cdda74dc6f",
+   "9045c6f9877be62623a83f6e880c5ca9f3dee620",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "b2ed1f2a4b49763c2dc3afe46f9560da98578ef9",
+   "79164f38d4f3bc6ff4cdfa38aad7825b7b8d8c0c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "e190427a1cfa6ab0151e6e1877f672b199199fc1",
+   "dabf50d51c685fe96a1f0187e667173af77d7922",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "07ffaf428a9bcf57103210b3dd04d8859da5f932",
+   "6a28a4c5e54771ec5a16a0034f6b2d26eed28592",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "9651117f5bbdf4e0916f5fe12808c2637e8d97ea",
+   "5c47aac9269384079e3d6b2f922e9ce25582aa1e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "20c08a716bbc62335c65741ec294814fcf53a760",
+   "c5367f0e3cb11180719119d78b45a590e35ba3be",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "0b306eb6fe1a40b720831dcbcaa1be3be78cc3f4",
+   "6df7de3ecdb23e89c8d9eca0a08a244e79117e15",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "d91096748d569540ccc3414f58ae5e26339b752b",
+   "88c6a0f7abacbccda0110f1afb4ca3835d3c772a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "346efd7b703979dcfa24e9d5683c59cd34382843",
+   "df434df7ab15e91e3b03dc958492a5d2626cc9a2",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "1524fe75ef7f215ab55627474f6376be07001761",
+   "2a264a4b107019254fd384995eec852d44ca80ad",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "2bdcedada2c0a4e8380ab911f6ad1a6d5633db9e",
+   "a6775759e6aad03ef1a605d4ac941218a0fb5069",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "039df094f3ca3c47174645d18d4403ebca6f441c",
+   "91e3cd520549ad076c744a33e3e5a83536cc0e13",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html": [
-   "b4dcff3d96a5b274ecdeb13e3f37d7311600a705",
+   "cc66c5cacd183b3be962f7c0b0ee09c57e80f01f",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html": [
-   "548efa17cbde12515b2b4cffa0b0656b2a7da289",
+   "cbf5e1c28ff594acf69c7455d85af5c4cf4634ea",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html": [
-   "c8832328a7a2f33d89aa346a321cb68a23642494",
+   "f2035473523352fae942d4465570d3b89700750c",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html": [
-   "600a384a03095ab317e9a0186ebd742084a1ae13",
+   "f1837a8f7bb87e69eb636414d8914ef0c5f6cb03",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "51e067dfed7bbe273b2cb649e2675564c0a1ab85",
+   "3882bfd35d98678e6e2de5a71e1962113bdf2a3e",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html": [
-   "93e2e7d60a35cf8dea9b4ffd50a0ca4b43920091",
+   "698f9f64c05ee59ae9970ad367b8d8164b2e1074",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "4bacdb7d0d0056274cfebbcdf81e2fd010cc7028",
+   "5e6177d17285b7347edbb428ff0734d809895ba4",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html": [
-   "7269727302bc15412523e6e1c3fc7e350cc721ea",
+   "07314409e95ce6c648bb02dff11bca5cc7d9a40a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html": [
-   "83764468686340988d79e5490faddcab6df707fc",
+   "c6aafb2d30694b446d4c7f9c540f43218a13616a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html": [
-   "9f3426e3497a23a87653e3a67906012c880b71a6",
+   "3e27d0de2aaceb936883489d2d79513c78ea227b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html": [
-   "3cfbfc698363f2a2b22d697fd1fedce94ec4619a",
+   "621ac5bb3e5d2f0245411555ea15ae3bb17e214b",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html": [
-   "ce4eb22b3c515332bc0abcb672b24a22d4256394",
+   "8711a507ab5f9ea33e82bdd2a43b83d44cba5ea4",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html": [
-   "6e88e62de3944cb1085d7e771af9b6fda101a4ba",
+   "81294f80501b5104fd2d4547ac44b6410d862f21",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html": [
-   "6ba93c949a4fabb271b51ed15f30b192e2f99e79",
+   "d0b1553b75a754500052829bd4f02d194366ac35",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html": [
-   "06498b0a1540ef1718fe70ca0767e7019f7599af",
+   "1d5ef96999956ef350e4b1f249585e4d8c5a06c4",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html": [
-   "bf535f51d2e276f072d3d9278163d4e229d74264",
+   "2e732e6567cd82f143302c061b2bb3126b98c946",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html": [
-   "c894530bb0794f44730a967ab418f8072afc4d56",
+   "2529091d31c47d545e1c2e2901483a686d6bc5b9",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html": [
-   "8ce347a651d5c78d9b16bea350b546fae2fc8a1a",
+   "ab2c0a35831c6e15ba4abf853dc7898cfa08e656",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html": [
-   "15b9c1e3e1cefa868793f705c3b28ab8c3bde723",
+   "56668b94ca1ebeb3bc681599cae4fa8525f3b6dc",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html": [
-   "bd59c62bed1c4acfd235efeb2304204127839529",
+   "f2593530884459a2e371f0bc04b16b8ebb741ad5",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html": [
-   "3252b205203692877e0a8b68f354cd4e0fd83c04",
+   "b5c7283668c11388c6aa57db48cd885af8deb773",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html": [
-   "806e1fb2b1759562c6e47532c2730d64d97a6be5",
+   "d4af8f3c3bbb4edff0acf210db39ffeab8e6fdf8",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html": [
-   "e06e2f9b8df75ffaabf4e0a3b4e290312249efaa",
+   "82055a7d4a265bdaaf5fd5f3b17da7710cbfee87",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html": [
-   "5bb6055a596dc87b2542d4f47302db2b658aacb6",
+   "f501512aaf3581988b53732c1e8f126f11b5cd19",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html": [
-   "336792a860f373dec8c1066e4421b365a74644d5",
+   "d76e3c62c5640d718abb63fcb5352eebb7dcf681",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html": [
-   "b0db112d2e79e40cd180aa933c0b47f6436f3279",
+   "7f50fdbe0775eed27bdf12fa6b8894c75de47700",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html": [
-   "6462ab026e24e9ad1dcd23d224a39a1f1b775530",
+   "529b4b306589c557ea728d67f01a970ce5107669",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html": [
-   "3541430743a3ccd16d21534fe5699194bc40c73a",
+   "340e5d55d5c9e819fd8f9b5684effb5b3547e504",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html": [
-   "082d5a98934ea2cfd0ed0a6c52a6632df69591fc",
+   "709d209649bc94b217e61e4dc3e5992b7243cb69",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html": [
-   "33520d4c383f48fbcd580b1de2e029e46164bd77",
+   "a94a77be5677dcec6895b81e2227cd747208b159",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html": [
-   "1a74dd98cb593a20cbf404517b56687101e19632",
+   "289d7ee4ee55e8def5deeff5bfd9858a8db504e4",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html": [
-   "6bb1f146470ab3f241edfd92aaf742857aed234c",
+   "e8314118acbebbf37b1f1727d571b4785471db60",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html": [
-   "4398edcf9f467ccc4c9bc173ee0eef4a78e575cb",
+   "3b744a333ca9f76333e6a5914fbe95b0061a0414",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html": [
-   "e148449dabb66d3b0c9468876c3e9baf494bdfb7",
+   "00c704c6e381bd1d2d00e1ea11671e8994d4377a",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html": [
-   "966bcab0dd1a1e6e3aa301137b7b13b6ac03040f",
+   "e35b0a640e3249b2c337f566e60eed2616bfbb46",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html": [
-   "73b629724c5a02ef96839b35489d94a86c324f1e",
+   "19f9faed6191d5e12b372df7dad1afcb98816e26",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html": [
-   "d4dda347aceccc90aed2d6d106d660eb376d41bd",
+   "42b8a17f07936eaa72485271cd909ec6abb214a8",
    "testharness"
   ],
   "referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html": [
-   "c0cb708a89c92cae8b4521d6927d2771e86c71ed",
+   "50ab0a6eaeb05a96b93a4ec41bad314571231f09",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "e291b25622db9b9747acd3ee1f3d27c6e64f3821",
+   "14a6eeb2bc663cc5e6ca066dab853a1993784919",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "b601eac442c9b7520c7576024daae582f90a5956",
+   "92c65585c5921cc32010bd7de5a0db5b4b72d4fc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "8afc306a5ab0199f1d6225c40ca080c85d925883",
+   "ede753c5361dbea97064e2b9fd20b2baf4edc7b0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "284441d95295e6ec80bbf8636722759faea67ebe",
+   "b1f6e1dc1dda20c229fd99e22911cc228f2698c2",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "2b2d2bc41baa22b3f8350488249370637ba134e7",
+   "b69090ff2b99613114b71423f04d8187d6347399",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "2d6a22576500491d7ecae40caf45e46b3e4f913e",
+   "a5bda07fa1740f66cd26160858ecfb45e698a581",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "883c4caddc88980969b4a25a86ea52e838ef8a28",
+   "c61e9dfe6f14e01d4e69adec9f55f4724786ebe9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "1060b3a3fdf2eb6b4edef9e41012303025f11777",
+   "d7a06eae0dd9ac6757c838d6f6c98a686f0f0f72",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "62c1bb6b13a987daedecfd251bd496f9a0651333",
+   "bd9d445ddc72cb7145c601e2d5dee5881592a560",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "254b585a6aa2669577aa6c8b1b231a1ec927040e",
+   "4bcfe741384c86db11e80ab3081033c18e5cff22",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "2cefa7d7a55a8a5cd96e6f2f79c3b192b6916533",
+   "2f55f3f4bf31fdd628479d44084bb46f26304baa",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "38b31583fe9b56a5a21d962f744d6d75ebe0a06f",
+   "fcdb3014ef792bd277ed0b15c17a8cf05fef7895",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "75529cdac1958ca9c3509f1915b4102ed4f6b77d",
+   "f6fc0deec71d03747036bb4c23c4d6af84a05ec6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "053812ab43e431e0805bc6dbe073643b3d2e0277",
+   "90db32e38180823349e0f830481cd7557b275d12",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "16019f74b9612258b7242df417146be64dca319a",
+   "2260553355211278f8943660ad00445509745a9f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "8d1c47429a92fd53965c0f4a771d870fb729c4ae",
+   "83d37336587bca8a65b994d2ae0899374eda8fee",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "7ec5986c5384f820efaf03dce374013301882afa",
+   "269dd5ab8153cc69c6ee2535ec1722251832c217",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "971d72f269aa04938dedd3b17664829a907af898",
+   "5367d9e882e1ae5e0e5703dfe296b453f1380595",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "b5d1a81244f5f44d07956946109913346d8756e4",
+   "999d68c277f371f59c5c55315e0517f2f2b3c73b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "520d166fbc5ea413392d975ef43bda85fbc5d29e",
+   "6e57d20ba552f37ab9635b73a3a7368b194e70f4",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "32ac74e363612d438371cb1ff296d3e552fa9f4f",
+   "b5e3d6c80a3fd065dc3e330149de035df8180f62",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "50ae745b422a0fff71aab884c83d2dbe979931a0",
+   "35dc6568c3ae5ede5a142ab984c3d901499b3019",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "fcfba132f25e65e73c9cfcaa3c1772d83a892f1b",
+   "cc38b182da7b83423d3715ec17eac8a5ebf2463f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "7b2278634927ebfd3041e5e196f755455f8173ee",
+   "dc3f4cf1e5ee3ac92cb63cf127eccc1f00a930bd",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "7b05f73b014138411f1a5a0e9ad626a20fbf5a1d",
+   "e5c1855fde432cdad8c9aaff2310c7e2574135ca",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "cdfcef9f6a05d0fef9ce6db579f509dfc465bd6b",
+   "4724f670f985c36d6d835da845b71c3b173dbda8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "f1d62e85da986feb2b2932d56cc3e223e43c0652",
+   "74f9f0e8a748ee208706f004bfdc9ee9e58389db",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "5194038e4f4d446d8cff672c2a1324fcf01b7ddf",
+   "15a6abbf5ca8d2dabdc21f2fb6b81a5ba95cfa14",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "7bb8efe9edb2b37f539d10ef17e62c879a12532a",
+   "d8f487a90ef9c4b264a1ec2763ceee919b4bf300",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "a872a8ab1913864e943a59d93d3d420b5cc3eb61",
+   "14d4f5fb06baea3fea81da75b8801fdcdb9c2ea5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "53000e7c2184821382cab13599d182a61e742545",
+   "3e02f034fec45c922c1ec6db8559c32bf6f82664",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "efbaf4f75a485012a1779800818c875f21b69888",
+   "3f20abbb40e9a4ed4c5d5d4ff651b79af58eed00",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "978b57918e12444d7687b25f772796cb53cf950e",
+   "e594604429ff8e2c6ca4ce303a7e54190e94e413",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "5654b4acaf912d4f5a1ccc80e786806c390b8925",
+   "3e0dcd40d3d229e1d6342a766d679510ff60348c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "c1598b359f28aeef8144c48eb3b89b5d14167fa9",
+   "ef5a7e6c88b1f9e67912005b6c2e0c40eac87611",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "17cb27df3d801280b110160f044ea0056bd0ac10",
+   "a50da9cb0cc45d547e7ff8d38e0e0a3c3ccd5f11",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f5133f94c5ce4720ef6191719ec0a81cfdceb8c3",
+   "4a01a41549b2fc56b75ec9ed283225002b1c71a9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "de4788d03aff51fd747c85ff31c68e56b1255b0a",
+   "0a66eea4641c6d551aa1dae3103bca4985144e3e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "13c40a2812866bcff972947f02b83209615c3545",
+   "5984794f2a08711464d4f36f6709e27420f2ed29",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "2c8aa643e080de15b3af97510cceeb6b4b1981c8",
+   "0c02a2ead89a211af5b681f59e23af7665e532df",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "dc33c3b39767f19b46f690e5d78366ef51c62d11",
+   "f22c4142335834d6dd4cf8f59d7604491a8615cd",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "297561ebfabe29ee2eff99f534fb3d19b56c0ee2",
+   "c656d41de40ada58d1d745686f409abfba75409a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "d41f5b3c7df9c99e8290e4dbe7bb1ab483eb5422",
+   "874e3cb3bed3b6e14a5bd1488ac538508b2b34c8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "3d7d6191032419f57f42ccdb0fdc12ecf11c338e",
+   "9d54a27187284372bb7e8e5b433fb904b073a47c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "17e4aad57b0553fa529cc739fc22ade8594dd8c7",
+   "43015a873cfb738b1f01607a2c5a393630f2fd6a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "980330031db983761cd08d66b2b5086d9cde89cc",
+   "ed58d7bd11b59dfc966b6f2549e140dee9cf8d12",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "680911c121a5798a1fae481d2fbcc1c637e32a08",
+   "c5114ecd89c8913e74373dd675213f0e80cf2b18",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "0043cccb481605aff1165118efd907462a31c641",
+   "34f650da7f40c04006e1447bc10ce48c5cc4d31d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "c21596e95ad4a0e99d428c9574872c6f7ad84743",
+   "1e668ae6d8b794e75c4e8a456a4d73997a5fa7d4",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "e91495b6765f2051e8ff3a000cca3cc6e1144992",
+   "19d80342987ac6a3cc378d6277bcd672302e7444",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "381891560fed0c648f006244b69344f02287d027",
+   "705411d518c88efcb1519e3941e1e0e793de3bc5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "ed4a807f2eea036f12eb272ebea02cac10244d38",
+   "99c1bc56a43ac09cfabf5a3fbe63421f618725a7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "2079f95ee4d9135bdeef3535720337bb09efc6d7",
+   "607b4c29e802ce96fe3061adffb4627b63dcd0f8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "eb8677f1be15fb5308d1e7d9e01ca54244dddf8b",
+   "1bc364522cd27a8ba3607a8596f1ac105522bb72",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "bc3d297fa656a88ab54a31d62460d229b0019cea",
+   "ca8adad124354fdbeabb9ace93a7b2f931721dcc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "eac37782a55ab6b097745d736d29f2d62962fe68",
+   "b04ed3354dd51f29d0d7349a987c1ec895983423",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "98230e1c09761f25dc8eed01e65f2e40f19c3feb",
+   "5f1e54d48dbef0d778a29e09c6ffa3572b958347",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "edad4c61f59079198a748d0eef62f66aa91d9179",
+   "a06130ce4a4b2859de2aee5dec0e3a6144d207cc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "81d67f9619b3b3e5cfd0bb7aa3cbe8e077766918",
+   "fbdaf4b05572a2d080d8d08172ee5787a021cb7a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "852cfcc72760bdd8c0157e11513b7279d499d167",
+   "4fd95a894c469a3b0a0d6d4f66423b91638bc2d3",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "f46bb775d86ff64d57420cd53540495f2f37c778",
+   "1f65303cd1026515064cf3bc664c952a94633b04",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "faa3ecc5b261b971a83932ac63e4656254ff5144",
+   "4b70a9afd131fb706467ca5c05811b4046777dbc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "9982670f2a09cb99c44597e6b5920439a58b31d6",
+   "f3c586e12e2817550478835a1bb0d009bebec9e6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "794876ce2368f328790583b1210b7d951b7fbb72",
+   "9bcb05db1fee6710a3edd93004e2d023e7631a76",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "65694ea8ef2f2fbfc2ad075a8b29c73563a3b97e",
+   "7b48d72c92e204c76ca5467a094727931e92944b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "bc5fd8f7dad043770ca560a7b9dcd2fba6a63667",
+   "5b539644181e96178bef8a84196f2328f5fb686b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "6d21efeb108ab87cf0a19a2c2c69c6fed503077c",
+   "841b54b58439330a7bf41dff8312e0908a73697e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "b62b8dfd19ad26baf5f2a2b92e37d483c01ff190",
+   "ae3939410a8a67fe0e32fa8a5644025a4cbc34f5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "915b89d0d823e16a5298d82f3cfd8fd2e9204271",
+   "4e7d7c9b9882a2bf98da9987aa19a1e4e54af3b8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "24f64dcd26601f3e4ce0713f62ef460915738a9d",
+   "f48a201bbb015ec6866dd2f378d8a4ba0c9d1fcf",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "25f7b70fef22bd26c42eccf4337777b0cac684c8",
+   "111fa37e95e55269594a257665ff1b9e0e48f125",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d50c6124ac96e2df844ac3455c9edc082c494788",
+   "d1cc1faef430e0f16b5d9321bbf11dbb3046a4e7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "2865c75d9a91abd0deec9094bdb4fd5c07f36260",
+   "155e9fb7bf2f9c867dfa38e43a09ae522a174ac1",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "d380572c889024defc9316ad006f5567fc79cfae",
+   "bcd5661d9c05c94f8fc52d846ceb7417130944bf",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "babc4da1eb44c83d85562925651e7f3832f642b6",
+   "a637f732ea0bade62b89cc2853da442e09a9dbe6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "2b416d9d9c726720f4a0f0b1e6809d0d60e5c2ef",
+   "18e29ee1fc6b22858c699faf7ff7dbd7f5027647",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "b4610eec30106cd0a018ae3b3fa0a1d38f8871f4",
+   "14ce35bd1eb9271ff7531687b70d39a8b6e8319c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "5d4339beeeef9afa267b20083fcd4c7e87aa168b",
+   "e9b5f75f9cc1432933517a368de96a20f2e733be",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "6fce0113fa216bb9ac38efcdc1a0b3e519a4e16f",
+   "392c57835588afd9e228780edb05782f8814b5e8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "3e39033495304c919bd6dff0fc9f534af4f17336",
+   "58977c3e7b471d6fe5596ff17cba06b632a4ddcb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "fbc85115c589b285ff0d25f51c2d25a4ffeeb68a",
+   "59cc2bda48578822bae191cebdbf0a9b085b9d77",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "606fa45a9f0b3e71114681e5fece50f36ff08ba9",
+   "67625838e8d1dc8721a06ce66d5db7ad464072eb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "8e8b4171f61da07189acc2045f0a7bd7e34c8c4b",
+   "45d7f1e916999bd0d3ab5e7466ed687374f960c2",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "1ca701f83a6b42b547684ea915f0ef255f3762e5",
+   "7d495b43c578c3e22f5c4debda976fc8c3a870bc",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "8fd755b7324ef2b37fa088d1cf12c98d12bf3f44",
+   "afd29bcd69b335b4522fe9b5a366cb621ba7c753",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "2c23d01e031d89eb722eb2f25d0491f9d114c8ba",
+   "e12c41d3b65ddb093d7a6d7e1ae17c9714eeb356",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "d9741ac502f343938541f179962c16a4156caed9",
+   "e44998937144817a9bbaea2fc7b0e41b51363fbb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "6f2468ed73aac1999c3412644a66852f49e70f1c",
+   "7544a66b826163be0a8f355078d476141403bf34",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "5a33342e331731d88d0fde156e849bb97ec60339",
+   "6c1bf13374562ced88c53e19265857bb0c3d1db6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "9d5f839b697de0bd746c77d6e532b5790319215c",
+   "e6424cdf9335297fba275058f3087cebefd2e23b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "be690fd1ac513c64661ff92ab68de1e90f635138",
+   "284af1c6860bdbcbb2901f7cf06f2cf72ca509d4",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "77fdb88b0a489ed90cab1497149b2552f5f87604",
+   "8c7f2bd5d37afd713f54150537142d0074a2d2bb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "9f6c2b9e090f2799e3d5af2918ebcf4a55f460b9",
+   "5ba5152bc2b200b1beac67fc3a520ed32dd7bf25",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "d2839e7fbc0d47cb5488217d287b2096935dd0c9",
+   "fcf8844e9008d86427f8430bd0459d2a08f5977a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "223ef23df6d5727ef519f2b286d892f6db0644af",
+   "698f15f58c1dcdfab9ad090bfd8bfdd79de6c429",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d2c37e36e884a7f7074bb144df84bcb362398b33",
+   "26b14d7314914d3cb3739a37a52634b27aacbc4e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "a9ea7a4cbdb933c04adf11597e05900c6fb39280",
+   "c632fa8e7834c972ec775bba86a8b1bf85e0358d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "344e99468e08b78e51bfe82d6055dfadf1bc5ce1",
+   "4590df6a0158343be205f2d65eede19f8c84c4a7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "74b759eaa4189136bcbd12ee61e3a37739c678d4",
+   "cbe8df3c4101810d9e053a2abf9b9684fab20093",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "9c41c2408e7035794f75dbb12b133e6807045874",
+   "69e5b6b483c76f8d9be9a7529d06adfe3c2cc560",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "afabdd7c4a3d631013c592ab91a9afc7ad1eff93",
+   "177bdd6c7722cf73b438584ee2421c6b9c547745",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "3da7d6e793252efea06cf22ba1d316f0e6513458",
+   "abe6ef4500c3319081f87d5e31dce50d5082f7da",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "3a23209ca1bf6132d4fafa7db7528a3eb34b1610",
+   "15fb33654e5d473876dbbf7a96b309154acf386f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "25ff9fedb69eeb357a72d20cb6e0ebcf0a416005",
+   "0d52c78f4a97f1371c52f1e226e7c35b909c2c06",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "d90818e03aadd84360423243dfc65c826a6f2845",
+   "ef9db2cbca18dd70e3712419f4ed4ef1e8797eb8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "e78acc588a9c52848ebc65177a7a0ae4e231b6bc",
+   "02678004f519f4d011144c2a855aa4ccc27469f6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "424becc9ed34dcd2bbef763e6a18772c0f5991b9",
+   "c391b257a816154a2d68ded1afced901668aa8a5",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "06241a094a87a5d750250ad0c999c0960d55f138",
+   "03c4677086d5df06155054fb110be80462dd200c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "548fc0fa27d0154966da5f0bb4c408441ec5f83b",
+   "60a0f6ebcb33854d6e34731ad931faa772a22733",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "89c4f67e7884177c6fda43a57b9eaf7a54f29740",
+   "d1745b41235b86cfe0d817f3080dd533765668b2",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "13269e2374cb2e7271ff1b0650b8ffdf32a3d4c3",
+   "989c847a5b903f6611db7a66418f7071a9cb8508",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "c6af90667eeaa1b1636c8bb74ad68a8884744b37",
+   "33df9910306ef3a6d44f0c11fb7d514ac83d09de",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "d94843cf8e5bc954348de62ad43a6bae29f498e0",
+   "d11c4a1897bc444eff605e93975be7a620c4757b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "2427b7b1d9d39a45e29a96c4f326f46a0afc1293",
+   "2bf06bb2110bf5cdd8f6bc71f075922f5f824e2e",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "ce86ed32d1f97233de9bc042b2975ee8699964bd",
+   "2bcca81084ca5e00c11d5f9d062c66cbf81a2c83",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "31ce151f68e0a24133b79b2856a25b40f265618c",
+   "e4b835d864414aa6618d34c3a150ac49df70e72d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "6be901d18dfee63da9b406efad4d3f0d9d8bfb42",
+   "20590be9e244841b5f48d9cd8d8ee79b1eff53b0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "6fca264dfc2b1ca5809ff1e0027de3686e2a57e2",
+   "cf7b83ef20a7d41c5fc8d5617d4519da8af9145d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "3d03ffc03c5d6a0689ca0f09efe6d4bd850540e9",
+   "96f5f8c07a1d0b4172c9ee7e30d8254c4b108591",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "0e6c3832783d85da08b67f22ce7be0b732b51632",
+   "8573cd5e8ee1547212c0afd5ca29eda46c27245f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "7106118fa3509aa16c8c81ab3e17479aff703252",
+   "8bf8bd05ff1f300d84760c52afc6d8643f6bf0d6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "8ac0b0b7db98003294d4e51730b34258966b680c",
+   "8d330b11bca89e7e15548886bf9012f944d2d26d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "f7ca8733723b38278a23a5ebe8c8f80ce954606a",
+   "fe3e977d0000e350fb5a8dec95ceea7daa2afbab",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "705d59b5d4dbaa08831bd4b3f9bee9ef4cc601ba",
+   "4db7894a80f04d6cf7ea9a7b942b32eba349cd88",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "3e848cd41be016881118fd8bec0ba35f3e9c05d5",
+   "8bb522349b0b6c1645ee6c167345eb46d812db1b",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "3606c5aba54908fb7902bc6371c993641d886559",
+   "db792b5164a2087cf1a5b5c14d02cdc99fb84bdd",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "13e1494b5275171495f046500ef2504ce325580a",
+   "c9b99a6b84184e1edfc8590311770c5d9466e921",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "93960a12ae764b69ac737f68f5d9ccae5eb3d946",
+   "8cdf6d70efabb8048225ab0fde804eabb0714d3a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "ea1dd0988cd101ae0fd915797a408e7d10b60564",
+   "9a41ab1b006a1c91000edde42d9f7c000d3c4c26",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0d6c638efdcaa8543e52cbc4a2569006ce159aad",
+   "581efdb75d7baf1d878045ea8a8876b3f4b8c0c6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "11755f981e799d57cb69d667c4eabde82dbba0b9",
+   "f2c77dcd96c1e06f10ecba4ca24f5d3232e3368a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "0a1aae62411d06216c5d0e235eb8d92322d58f5a",
+   "8db2725b16bad4bd349abdaba4e2baadb867b818",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "2f81ef0d6fe8690720324a83bd4601c8855b49af",
+   "11baca87b2482422f0cf6b5a004645a7e9afae61",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "373ee4faeb72f871570ba7d4b33f8b58bdeedfc7",
+   "0dcfaf498709fcbc66514794d237e8af41ece7cf",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "0d4be355e349a7799c564295cd2bed8bca140311",
+   "7f14e55c1314658193e256b21651129be80de31f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "75a741a893b47d7f88de8e7b5b2a91cf51ab4f58",
+   "1c44e334cfd1b9a7f8da224e5aaf53175264f040",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "626646144539049990c47dc4729a844f4397b3bf",
+   "e349d5686ffb375d92aca01df466119fc55a53fa",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "a6dfd3774a1dd618e9ce8cb88869df2e045c35bf",
+   "500d47a1c954e4560255b3a4047df271dae4ba2a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "33a64705f65e40c42e84bbe359d2496f150c9c82",
+   "21549ca927e0d9b3693a85e4462aa4f3878385ba",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "a8af3f121e2cb34399cdbe1943d70e569fd1360f",
+   "ca7d40ed2f6480b86302ae6059787c789afc4a93",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "de0ee672f257f549c4f45ce4b37a777efbd7a3d1",
+   "fdc8bbef59d399c298a8b2b686fa6b874390eea8",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "d44be78097c5e172aa3a66f008ccebbd5cf16e6f",
+   "e6518c9e47974797527f917b53cd8237ba90a9b1",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
-   "3f03093ccd46a34e9a4eb32ad80395b7b965034c",
+   "31ef25738901928642d370e856fb99428b10b15c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "a3f4330e8117f1d1cedd14af06544b1704918ddb",
+   "220b5aa320dd3fb84c53fb2dc2b23d0504fe3cb6",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html": [
-   "eea0a1b07774be28853f4f872eb9c49ab3d12587",
+   "f0b4658aec639d7a751685263ceed718d9113642",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "d0302557ed7888e9001ba9884f57842b6ae59c93",
+   "4cfd819a47321b343bb0f5211cae6b99f900c996",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "796d6e1dd30ab1469d0bc20b7fc4fa08ede4076c",
+   "4ea3fe52684ff1bf2bf515d26a89cda3b4ab45e0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html": [
-   "b406297bcc689fe16fe443b1f373b74343391ca9",
+   "0978fb710d6d925d418ff739a4b65d65707137a2",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "3f2d4cb941531e9758819981bac697e4c0c7e4fe",
+   "7a4fe02b9b7d32190d5cc449981802716e258b6d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "2db6b9be449a8a981f4375afebcc8eddf7de9120",
+   "bf7140a15d274fb1c7861a74e3089707dbcde37d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html": [
-   "066862d3b4879acc045ddcc41072ab78aa7da3b2",
+   "a40088b5b677ca84b1d0791f768281f302d90522",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "24e5665f1924d95897f51086f7e90064db173cd0",
+   "763f6f02ee4e2f72c90a883afece94f53331806a",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "85e5f3b809342a498e419eb1770620bb61366841",
+   "21065a0f8b5b95b73494788a1d1a422432e17584",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html": [
-   "d8572397c2003addabbb70715d7a5e78d4022c16",
+   "21b9d284bfae0c8f67e742a931f2ed17847ed497",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html": [
-   "9ef2d4b55cfcae476b78e93e49efd76b205c6aad",
+   "6911528c08df17a1257a6f5d77036e51c20f0347",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html": [
-   "19f9f506205925a9a4ac4e692acf9abe2998b3cd",
+   "cf7d1dd9c279a27ec972cb3c465e4f168b39bdae",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html": [
-   "cf8accb0574971823f7b86e8eea2770d7c462be9",
+   "21882b16a44eccd2054e25bb79869e59f21d93d0",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html": [
-   "40aa72119a24b1b9120dee4050d4e18101071b42",
+   "0028373a419d443f55eb87bd20bf77126dfc49bb",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html": [
-   "ae0ad649a98a53aa7fbb74354a0bbae3ea6b37c2",
+   "17eff8230843f649f38fcf2e13196997e5168a11",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "3ba347771a9dd4b9d8502c5be0893e2a6b56daad",
+   "dfff2a541dc8cc5a369a85a440b86eb85bc01d3d",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html": [
-   "113b0d05e70acbbc656da04d2fb8b95a1857c491",
+   "3c7cea5bca027ea0cf99d99894c7e289ac5ab270",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html": [
-   "64288b1e041b30886f9c8f39fce21c2a6e5742e6",
+   "96971a833e3ac8259f269baf09dd9c2bf9db4d0c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html": [
-   "ffbe9ac4f5ebdcca4537c6e313beea9f1029ae2e",
+   "c98fa10e571784818b4e98efa4d7f87a88d4254f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html": [
-   "9ad749f8bb93c5c5ca1077352edf35b7b585f91c",
+   "4fe678652d0547e27cd21a375e799c0b5237f0ca",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html": [
-   "3a835f52f1957baa4be69b0dcf5cba11f5c95730",
+   "0f7f92fa9073418db035af3d3dbbcfbd7ac0d3ba",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "40913eb625ef409baada73680693bbe18d937202",
+   "c2e04ad3614d825f572acaf798400519d46369b3",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html": [
-   "51f1548b7dbf3d83f7b5ff319b26888d4f1b3571",
+   "1aaa67c96d122b59dc70c098bbfad3d4e8178308",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "ffcee216c78e8ff3b273236296b42063f4bee357",
+   "7af45bc8865786282b668007be8834c91cfddcda",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "049adf5283ade38948fb60076209d3ced3c5d37d",
+   "054b2eb241ab4c5801257e2e7a4dcb0907faee34",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html": [
-   "4e691492849a8f18908ee39660a21301ab851107",
+   "faf51f1e759fc7060412ba330c8be0d5574e446c",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "f1ac19a55770541d6e4b4736e6ba2336609bf197",
+   "a91416957959dd96a1a42291dbebc6f003c93c87",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "30429e29c75cb17dae4ad3e33c470ad602c534a8",
+   "6242cbd961b784a3613f39946bf9f9c2ca45b147",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html": [
-   "b9a1580e15b5bf310f251d826b605c5fc0b9b7f6",
+   "90eb85f139809e22b05b29772ddf1f44f22c6fda",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "0f657ff1c19007d56867e8394207369b5dbfc9af",
+   "74f43287d9b1a59a1c8f98b3b34bdb90f2e383d4",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html": [
-   "63a2168789fed25bd6305c93b55043d1a23e7e3a",
+   "53cdc7edf00539770febe12e7abaf95a74e3b2ce",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html": [
-   "131726e2bbaee6fa1930420f0bb6dcea12083e4e",
+   "406ef5dff60559e9be4f0e1aad56b63c321d83d7",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html": [
-   "1fc3a147b80fda8d8741aa3256920de55147108a",
+   "993c9ea86b19df0d8eddff027d154884197b87a9",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html": [
-   "623783a50c5b615463bfd7e4ca1cf498ad5a033e",
+   "d88b4994e32f0818db42e3ec40e0bde2c949b28f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html": [
-   "deb4e20c74b0b385a7c15f610568ecaa9181dd16",
+   "e5a4240f5a4d052763d392d0f69d64936ee2175f",
    "testharness"
   ],
   "referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html": [
-   "8b315b207fa2fd6654449505ea8c51b79fb460fa",
+   "834e2ef0101889b0c71934b2f0255bd7269c6a74",
    "testharness"
   ],
   "remote-playback/META.yml": [
@@ -709394,7 +709964,7 @@
    "support"
   ],
   "signed-exchange/resources/generate-test-sxgs.sh": [
-   "64c28325d3a98e330dafc0a5567f4681b812ff55",
+   "a7776114379a8349feebc9e0ba8d32872260cc9a",
    "support"
   ],
   "signed-exchange/resources/inner-url.html": [
@@ -709481,6 +710051,10 @@
    "072125400abb5b6a19039d798a5f29261154efaf",
    "support"
   ],
+  "signed-exchange/resources/sxg/sxg-data-cert-url.sxg": [
+   "b5972d545cb564bf38c527bfd6dbc52656060742",
+   "support"
+  ],
   "signed-exchange/resources/sxg/sxg-hsts.sxg": [
    "8f57c63dfab73eb5d05600f7563bb0a4ae938834",
    "support"
@@ -709577,6 +710151,10 @@
    "ad21ebb20d44c846bd99cbffeb510c8af2bb81ea",
    "testharness"
   ],
+  "signed-exchange/sxg-data-cert-url.tentative.html": [
+   "0d6bd5602e0ca0e6610b9fe2fb48b94fd5821bfd",
+   "testharness"
+  ],
   "signed-exchange/sxg-double-prefetch.tentative.html": [
    "d682741744fed929bee8e62fbae4857a4bfbf1d5",
    "testharness"
@@ -714350,11 +714928,11 @@
    "support"
   ],
   "tools/ci/azure/install_chrome.yml": [
-   "5a8dccd6e68e6a39a47ea4e27f996a5c96c22ace",
+   "6bd5c2334ad4e3e4d5d6faaf8005f4e0b44cf1fe",
    "support"
   ],
   "tools/ci/azure/install_firefox.yml": [
-   "cf5089b60fb8fdb5d394315f0f8d144440554e2c",
+   "de6d0335f221f6d2215ebdc8ef5d2ee269fdfdf3",
    "support"
   ],
   "tools/ci/azure/install_fonts.yml": [
@@ -714370,7 +714948,7 @@
    "support"
   ],
   "tools/ci/azure/pip_install.yml": [
-   "6220abcbde5dca92450dfdf1c703ee6080ceccb8",
+   "f892deb9072e0fdec20540bdb7342a76e83e3391",
    "support"
   ],
   "tools/ci/azure/system_info.yml": [
@@ -714658,7 +715236,7 @@
    "support"
   ],
   "tools/lint/tests/test_path_lints.py": [
-   "ab44c559187e8e435a34d5e13076feb420a15270",
+   "9f6f49e14a12e65979b7fcccc70e405cda213afb",
    "support"
   ],
   "tools/localpaths.py": [
@@ -714666,7 +715244,7 @@
    "support"
   ],
   "tools/manifest/XMLParser.py": [
-   "212bd7f32f48e05531607a436fa151f6f29d43de",
+   "8b4d5c7de1c237ce6ef50657c9d9d8f9a297a30c",
    "support"
   ],
   "tools/manifest/__init__.py": [
@@ -714686,7 +715264,7 @@
    "support"
   ],
   "tools/manifest/item.py": [
-   "f18e5ba6c9de2c82dab3be03f07fb470204785a3",
+   "18c906b6d67d1faa6de8984736eeec9462cb2a45",
    "support"
   ],
   "tools/manifest/log.py": [
@@ -714714,7 +715292,7 @@
    "support"
   ],
   "tools/manifest/tests/test_manifest.py": [
-   "25944d5aca8e86ae1cd8bdc55dec8153ecfde85c",
+   "224999ab7396fa4be3d99e6e3c168635171675f3",
    "support"
   ],
   "tools/manifest/tests/test_sourcefile.py": [
@@ -715138,7 +715716,7 @@
    "support"
   ],
   "tools/requirements_flake8.txt": [
-   "cc9098d218acfef3c23ea14b4fa176997c281365",
+   "480aacd466257f82068f5c133ec90e59a2b1eb4f",
    "support"
   ],
   "tools/requirements_mypy.txt": [
@@ -715230,7 +715808,7 @@
    "support"
   ],
   "tools/serve/test_functional.py": [
-   "60b950fc8aa8da00a28d6212c46c6c5c75a2ab0a",
+   "894479d111c90dad925c683cb0e93ac13fc68619",
    "support"
   ],
   "tools/serve/test_serve.py": [
@@ -719310,7 +719888,7 @@
    "support"
   ],
   "tools/wptrunner/requirements.txt": [
-   "c173188379a8e9b2fabd6ef68c6d93b6d9cbc7d4",
+   "ff0adf17ac8cf60ee4878b99801b60605e6046c3",
    "support"
   ],
   "tools/wptrunner/requirements_chrome.txt": [
@@ -719742,7 +720320,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/testloader.py": [
-   "bd08a9cd5cf40db1a5c542aabff747c6ada71f7b",
+   "1ffdda6003fad3fe6c770ad7d1bce9a20f10ccda",
    "support"
   ],
   "tools/wptrunner/wptrunner/testrunner.py": [
@@ -720130,11 +720708,11 @@
    "support"
   ],
   "tools/wptserve/tests/functional/test_input_file.py": [
-   "b3f0fba48abad1d600fe757a1d273146398609d7",
+   "98176e583862841df9de27779dcfe5ff8f7a614b",
    "support"
   ],
   "tools/wptserve/tests/functional/test_pipes.py": [
-   "86b4be6b129dc10cf76ff607a5496ddb3492ccc9",
+   "bad4d624c9f0a29bc8e4b3a740c0ffe834dc88f3",
    "support"
   ],
   "tools/wptserve/tests/functional/test_request.py": [
@@ -720162,7 +720740,7 @@
    "support"
   ],
   "tools/wptserve/tests/test_stash.py": [
-   "4813504a7e1fa3ded7ef60aec5d7f063af09fec7",
+   "1ea99c0609f5bed859651284eb3da80a4cddf737",
    "support"
   ],
   "tools/wptserve/wptserve/__init__.py": [
@@ -720222,7 +720800,7 @@
    "support"
   ],
   "tools/wptserve/wptserve/sslutils/openssl.py": [
-   "db188dad70a816d5188d4f7cff021f092a514419",
+   "3c5c1dc23787095b1a67cae7c011b8ad5c785949",
    "support"
   ],
   "tools/wptserve/wptserve/sslutils/pregenerated.py": [
@@ -720922,7 +721500,7 @@
    "testharness"
   ],
   "url/historical.any.js": [
-   "c3797ad263850c7d3765bbefab24af10ba6e890a",
+   "407e118f3a05f986c29011c698b5081743c6b62c",
    "testharness"
   ],
   "url/idlharness.any.js": [
@@ -721145,6 +721723,10 @@
    "0de68965ddb9c7a53ca5595874bb20a3d7d2ca71",
    "testharness"
   ],
+  "user-timing/performance-measure-invalid.worker.js": [
+   "dedd6da8884f1afffb18a61a800970796d678a20",
+   "testharness"
+  ],
   "user-timing/resources/user-timing-helper.js": [
    "8d43768ec2819620bf637c41918e8a6e6bc72181",
    "support"
@@ -721233,6 +721815,10 @@
    "5499f77335b0a2128f7395e73ee777f07a2346b4",
    "support"
   ],
+  "visual-viewport/helper-resize-event-on-load-overflowing-page.html": [
+   "c036b16ec87bc7e562c4040ad1923c5a8b483cec",
+   "support"
+  ],
   "visual-viewport/viewport-attribute-event-handlers-manual.html": [
    "896f6cd98b3f94099ba59efce24bf301997d8a28",
    "manual"
@@ -721270,7 +721856,7 @@
    "manual"
   ],
   "visual-viewport/viewport-resize-event-on-load-overflowing-page.html": [
-   "c4b36879ad1f643da52271f2b7f8be3c45183cfa",
+   "d5dc1deae7279d3dc1b8c67a3a92e65c7a5e409d",
    "testharness"
   ],
   "visual-viewport/viewport-scale-iframe-manual.html": [
@@ -722786,7 +723372,7 @@
    "testharness"
   ],
   "web-animations/interfaces/Animatable/getAnimations.html": [
-   "01b4f112a0cf1a2b02abbaf61bfdaa6b5a6b6b74",
+   "8264bcfd3fe45fa62bb0fae616a28c9f1622af2c",
    "testharness"
   ],
   "web-animations/interfaces/Animation/cancel.html": [
@@ -723218,7 +723804,7 @@
    "testharness"
   ],
   "web-nfc/NFCWriter_push.https.html": [
-   "d53e5023a1b6aa6133a6f878888d5450c252678d",
+   "5badeb4083855549c9d9f241391ac6e0948f01e2",
    "testharness"
   ],
   "web-nfc/NFCWriter_push_signal-manual.https.html": [
@@ -726154,7 +726740,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-helper.js": [
-   "5426e5810738d74724f13b2044f5cce7e5e720cd",
+   "986204df8b78d58af4fd4b171751931fb35ee563",
    "support"
   ],
   "webrtc/RTCPeerConnection-iceConnectionState-disconnected.https.html": [
@@ -726310,7 +726896,7 @@
    "testharness"
   ],
   "webrtc/RTCRtpReceiver-getSynchronizationSources.https.html": [
-   "82ce3bd8467b6a29e4b40a105151b50314b5bf46",
+   "a78ede0d90863dbfa458807d435a34cd9087b61f",
    "testharness"
   ],
   "webrtc/RTCRtpSender-getCapabilities.html": [
@@ -726354,7 +726940,11 @@
    "testharness"
   ],
   "webrtc/RTCSctpTransport-events.html": [
-   "777ac252bc18e36abba666833d79657798992997",
+   "dc4ea7bde13c5e92294d2924b5a818450fd498a4",
+   "testharness"
+  ],
+  "webrtc/RTCSctpTransport-maxChannels.html": [
+   "e62404a21a0834b999a0874afd6345e49342b761",
    "testharness"
   ],
   "webrtc/RTCSctpTransport-maxMessageSize.html": [
@@ -726437,8 +727027,12 @@
    "1310717ccb9c035b011ff5fe5430fbd7e9f158f2",
    "support"
   ],
+  "webrtc/protocol/candidate-exchange.https.html": [
+   "2603a02cddf3f026b09b8a233d17ff3f92bd43a1",
+   "testharness"
+  ],
   "webrtc/protocol/ice-state.https.html": [
-   "99d2a25eede4a5f2f151bc5bad6abbada8a79784",
+   "4a6b4333e16a179e6fffadde0a7018eb91895104",
    "testharness"
   ],
   "webrtc/protocol/jsep-initial-offer.https.html": [
@@ -730986,11 +731580,11 @@
    "testharness"
   ],
   "webxr/xrFrame_getPose.https.html": [
-   "e3dd77be72a2a391c93813199c427eed30e48fb3",
+   "243fb8cd66617667f8d2dae5742112e3fc476dec",
    "testharness"
   ],
   "webxr/xrFrame_lifetime.https.html": [
-   "b924c89771e89457966f0f2d3a8e8e4408376a10",
+   "27ef02de337451551d4e028bc7e6f5de524d8aeb",
    "testharness"
   ],
   "webxr/xrRay_constructor.https.html": [
@@ -731025,10 +731619,6 @@
    "26b6b47d2bfeea35249bd36ca49fda1d5b2ec1f8",
    "testharness"
   ],
-  "webxr/xrSession_identity_referenceSpace.https.html": [
-   "07abc39728c0453668a4fbdc785a9194a2dfb7a0",
-   "testharness"
-  ],
   "webxr/xrSession_prevent_multiple_exclusive.https.html": [
    "e61bd392718ae3b0f8ac8de0fa81604f2d32dcce",
    "testharness"
@@ -731038,23 +731628,27 @@
    "testharness"
   ],
   "webxr/xrSession_requestAnimationFrame_data_valid.https.html": [
-   "44e903e4fb980d672ad6580f2d630874fa9c4b72",
+   "c5108e4eccf9f553fb4ee2990c6cd6ad471d16c7",
    "testharness"
   ],
   "webxr/xrSession_requestAnimationFrame_getViewerPose.https.html": [
-   "5606fa1ab12b1f359de4e88bdf703b5835be2c16",
+   "95d9e78105948fc496af2ecec1dc015ff25fc134",
    "testharness"
   ],
   "webxr/xrSession_requestReferenceSpace.https.html": [
-   "0027d5dce01af7499e1037311c27ad29f66328d1",
+   "2fbf9b977ca153acf7028bd73844b7eb10c20b72",
    "testharness"
   ],
   "webxr/xrSession_transfer_outputContext.https.html": [
    "759d97ba184067f0f4df431500f5eabddd788921",
    "testharness"
   ],
+  "webxr/xrSession_viewer_referenceSpace.https.html": [
+   "85e5e87f8266f2701c96dc643e8890942ef013bd",
+   "testharness"
+  ],
   "webxr/xrView_eyes.https.html": [
-   "847ba388a70c158725ef567a3b1fe0f7947c97d7",
+   "8090bcebadb39902189c716b8434de949e9c5ae9",
    "testharness"
   ],
   "workers/META.yml": [
@@ -732854,7 +733448,7 @@
    "testharness"
   ],
   "x-frame-options/sameorigin.sub.html": [
-   "9efbc320946e34baa416e39205d8f39c71325637",
+   "ede5446825995fce987d136c34f31a01ee87179c",
    "testharness"
   ],
   "x-frame-options/support/helper.js": [
@@ -732862,7 +733456,7 @@
    "support"
   ],
   "x-frame-options/support/nested.py": [
-   "c7dca4aeee59385e37d79d086c1270a9f25c9c43",
+   "e640f37a2306abed12bd11a1ae776ba93030fc57",
    "support"
   ],
   "x-frame-options/support/redirect.py": [
diff --git a/tests/wpt/metadata/css/CSS2/floats/new-fc-separates-from-float-3.html.ini b/tests/wpt/metadata/css/CSS2/floats/new-fc-separates-from-float-3.html.ini
new file mode 100644
index 00000000000..2ad67d928d1
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/new-fc-separates-from-float-3.html.ini
@@ -0,0 +1,2 @@
+[new-fc-separates-from-float-3.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-018.html.ini b/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-018.html.ini
new file mode 100644
index 00000000000..773e4c78204
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-018.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-018.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-019.html.ini b/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-019.html.ini
new file mode 100644
index 00000000000..1dc4e500f88
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-breaking/line-breaking-019.html.ini
@@ -0,0 +1,2 @@
+[line-breaking-019.html]
+  expected: FAIL
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
new file mode 100644
index 00000000000..70a00a101f6
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -0,0 +1,2 @@
+[no-transition-from-ua-to-blocking-stylesheet.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
index 8850ec200da..f7a7bb33d42 100644
--- a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
@@ -74,3 +74,6 @@
   [opacity end]
     expected: FAIL
 
+  [border-left-width end]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/filter-effects/backdrop-filter-clipped.html.ini b/tests/wpt/metadata/css/filter-effects/backdrop-filter-clipped.html.ini
new file mode 100644
index 00000000000..84aa5dcf64e
--- /dev/null
+++ b/tests/wpt/metadata/css/filter-effects/backdrop-filter-clipped.html.ini
@@ -0,0 +1,2 @@
+[backdrop-filter-clipped.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/filter-effects/backdrop-filter-update.html.ini b/tests/wpt/metadata/css/filter-effects/backdrop-filter-update.html.ini
new file mode 100644
index 00000000000..03a078f02c3
--- /dev/null
+++ b/tests/wpt/metadata/css/filter-effects/backdrop-filter-update.html.ini
@@ -0,0 +1,2 @@
+[backdrop-filter-update.html]
+  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 931df41a099..a236ee7eb01 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,9 +312,6 @@
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: */* text/html]
     expected: FAIL
 
@@ -333,3 +330,9 @@
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;charset=gbk text/plain text/html]
+    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 87c807a49ff..a639f15230c 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,3 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
+  [Content-Type-Options%3A%20nosniff]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    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_3.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index 385376c7321..51f8272a6de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.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
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
deleted file mode 100644
index 8cc42056d34..00000000000
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[non-active-document.html]
-  [DOMParser]
-    expected: FAIL
-
-  [createHTMLDocument]
-    expected: FAIL
-
-  [<template>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 650c91da4a6..333edb3a26e 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,5 +1,4 @@
 [sharedworker-in-worker.html]
-  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
deleted file mode 100644
index dbea4f293ad..00000000000
--- a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[transition_calc_implicit.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index aff69297b39..99873aece5c 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -138,6 +138,74 @@ jobs:
     parameters:
       directory: tools/wpt/
 
+- job: tools_unittest_win
+  displayName: 'tools/ unittests (Windows)'
+  dependsOn: decision
+  condition: dependencies.decision.outputs['test_jobs.tools_unittest']
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '2.7.x'
+  - template: tools/ci/azure/checkout.yml
+  - template: tools/ci/azure/tox_pytest.yml
+    parameters:
+      directory: tools/
+      toxenv: py27
+
+- job: tools_unittest_win_py3
+  displayName: 'tools/ unittests (Windows Python 3)'
+  dependsOn: decision
+  condition: dependencies.decision.outputs['test_jobs.tools_unittest']
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.6.x'
+  - template: tools/ci/azure/checkout.yml
+  - template: tools/ci/azure/tox_pytest.yml
+    parameters:
+      directory: tools/
+      toxenv: py36
+
+- job: wptrunner_unittest_win
+  displayName: 'tools/wptrunner/ unittests (Windows)'
+  dependsOn: decision
+  condition: dependencies.decision.outputs['test_jobs.wptrunner_unittest']
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '2.7.x'
+  - template: tools/ci/azure/checkout.yml
+  - template: tools/ci/azure/tox_pytest.yml
+    parameters:
+      directory: tools/wptrunner/
+
+- job: wpt_integration_win
+  displayName: 'tools/wpt/ tests (Windows)'
+  dependsOn: decision
+  condition: dependencies.decision.outputs['test_jobs.wpt_integration']
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+  # full checkout required
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '2.7.x'
+  # currently just using the outdated Chrome/Firefox on the VM rather than
+  # figuring out how to install Chrome Dev channel on Windows
+  # - template: tools/ci/azure/install_chrome.yml
+  # - template: tools/ci/azure/install_firefox.yml
+  - template: tools/ci/azure/update_hosts.yml
+  - template: tools/ci/azure/update_manifest.yml
+  - template: tools/ci/azure/tox_pytest.yml
+    parameters:
+      directory: tools/wpt/
+
 - job: infrastructure_win10
   displayName: 'infrastructure/ tests (Windows 10)'
   # This job is only triggered manually until it has been shown to be robust.
diff --git a/tests/wpt/web-platform-tests/.gitattributes b/tests/wpt/web-platform-tests/.gitattributes
new file mode 100644
index 00000000000..5c11e4e33a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/.gitattributes
@@ -0,0 +1 @@
+*       -text
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html b/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html
index f4daf182f74..e95e71c59bc 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigation/to-javascript-parent-initiated-child-csp.html
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
-<iframe src="support/frame-with-csp.sub.html?csp=script-src%20%27self%27"></iframe>
+<iframe src="support/frame-with-csp.sub.html?csp=script-src%20%27unsafe-inline%27"></iframe>
 <div onclick="frames[0].location.href = 'javascript:parent.postMessage(\'executed\', \'*\')'" id="special_div"></div>
 <script>
   var t = async_test("Should have executed the javascript url");
diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__secure.header.https.html b/tests/wpt/web-platform-tests/cookies/prefix/__secure.header.https.html
index 8753a320b4e..70d29873cf2 100644
--- a/tests/wpt/web-platform-tests/cookies/prefix/__secure.header.https.html
+++ b/tests/wpt/web-platform-tests/cookies/prefix/__secure.header.https.html
@@ -26,7 +26,8 @@
   // Without 'secure'
   set_prefixed_cookie_via_http_test({
     prefix: "__Secure-",
-    params: "Path=/;domain=" + CROSS_SITE_HOST,
+    // SameSite=None is necessary because cross-site origins cannot set SameSite cookies via fetch.
+    params: "Path=/;SameSite=None;domain=" + CROSS_SITE_HOST,
     origin: SECURE_CROSS_SITE_ORIGIN,
     shouldExistViaHTTP: false,
     title: "__Secure: secure origin: Should not set 'Path=/;domain=" + CROSS_SITE_HOST + "'"
@@ -35,7 +36,8 @@
   // With 'secure'
   set_prefixed_cookie_via_http_test({
     prefix: "__Secure-",
-    params: "Secure;Path=/;domain=" + CROSS_SITE_HOST,
+    // SameSite=None is necessary because cross-site origins cannot set SameSite cookies via fetch.
+    params: "Secure;SameSite=None;Path=/;domain=" + CROSS_SITE_HOST,
     origin: SECURE_CROSS_SITE_ORIGIN,
     shouldExistViaHTTP: true,
     title: "__Secure: secure origin: Should set 'Secure;Path=/;domain=" + CROSS_SITE_HOST + "'"
diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js b/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js
index 1cd924a0c93..f0ca5d6d245 100644
--- a/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js
+++ b/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js
@@ -142,6 +142,7 @@ async function resetSameSiteCookies(origin, value) {
       assert_dom_cookie("samesite_strict", value, false);
       assert_dom_cookie("samesite_lax", value, false);
       assert_dom_cookie("samesite_none", value, false);
+      assert_dom_cookie("samesite_unspecified", value, false);
     }
 
     w.postMessage({type: "set", value: value, useOwnOrigin: true}, "*");
@@ -150,6 +151,7 @@ async function resetSameSiteCookies(origin, value) {
       assert_dom_cookie("samesite_strict", value, true);
       assert_dom_cookie("samesite_lax", value, true);
       assert_dom_cookie("samesite_none", value, true);
+      assert_dom_cookie("samesite_unspecified", value, true);
     }
   } finally {
     w.close();
@@ -159,7 +161,8 @@ async function resetSameSiteCookies(origin, value) {
 // Given an |expectedStatus| and |expectedValue|, assert the |cookies| contains the
 // proper set of cookie names and values.
 function verifySameSiteCookieState(expectedStatus, expectedValue, cookies) {
-    assert_equals(cookies["samesite_none"], expectedValue, "Non-SameSite cookies are always sent.");
+    assert_equals(cookies["samesite_none"], expectedValue, "SameSite=None cookies are always sent.");
+    assert_equals(cookies["samesite_unspecified"], expectedValue, "Unspecified-SameSite cookies are always sent.");
     if (expectedStatus == SameSiteStatus.CROSS_SITE) {
       assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not sent with cross-site requests.");
       assert_not_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are not sent with cross-site requests.");
@@ -172,6 +175,32 @@ function verifySameSiteCookieState(expectedStatus, expectedValue, cookies) {
     }
 }
 
+// Same as above except this expects samesite_unspecified to act the same as
+// samesite_lax (which is the behavior expected when SameSiteByDefault is
+// enabled).
+function verifySameSiteCookieStateWithSameSiteByDefault(expectedStatus, expectedValue, cookies) {
+    assert_equals(cookies["samesite_none"], expectedValue, "SameSite=None cookies are always sent.");
+    if (expectedStatus == SameSiteStatus.CROSS_SITE) {
+      assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not sent with cross-site requests.");
+      assert_not_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are not sent with cross-site requests.");
+      assert_not_equals(cookies["samesite_unspecified"], expectedValue, "Unspecified-SameSite cookies are not sent with cross-site requests.");
+    } else if (expectedStatus == SameSiteStatus.LAX) {
+      assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not sent with lax requests.");
+      assert_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are sent with lax requests.");
+      assert_equals(cookies["samesite_unspecified"], expectedValue, "Unspecified-SameSite cookies are are sent with lax requests.")
+    } else if (expectedStatus == SameSiteStatus.STRICT) {
+      assert_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are sent with strict requests.");
+      assert_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are sent with strict requests.");
+      assert_equals(cookies["samesite_unspecified"], expectedValue, "Unspecified-SameSite cookies are are sent with strict requests.")
+    }
+}
+
+// Get the proper verifier based on the test's variant type.
+function getSameSiteVerifier() {
+  return (location.search && location.search === "?samesite-by-default-cookies.tentative") ?
+      verifySameSiteCookieStateWithSameSiteByDefault : verifySameSiteCookieState;
+}
+
 //
 // LeaveSecureCookiesAlone-specific test helpers:
 //
@@ -196,6 +225,22 @@ return credFetch(origin + "/cookies/resources/dropSecure.py")
  })
 }
 
+// Reset SameSite=None test cookies on |origin|. If |origin| matches
+// `self.origin`, assert (via `document.cookie`) that they were properly
+// removed.
+function resetSameSiteNoneCookies(origin, value) {
+  return credFetch(origin + "/cookies/resources/dropSameSiteNone.py")
+    .then(_ => {
+      if (origin == self.origin) {
+        assert_dom_cookie("samesite_none_insecure", value, false);
+        assert_dom_cookie("samesite_none_secure", value, false);
+      }
+    })
+    .then(_ => {
+      return credFetch(origin + "/cookies/resources/setSameSiteNone.py?" + value);
+    })
+}
+
 //
 // DOM based cookie manipulation APIs
 //
diff --git a/tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py b/tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py
index 803dbeb82cd..4a3f890cb91 100644
--- a/tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py
+++ b/tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py
@@ -1,12 +1,13 @@
-from helpers import makeDropCookie, readParameter, setNoCacheAndCORSHeaders
+from helpers import makeDropCookie, setNoCacheAndCORSHeaders
 
 def main(request, response):
     """Respond to `/cookie/same-site/resources/dropSameSite.py by dropping the
-    three cookies set by setSameSiteCookies.py"""
+    four cookies set by setSameSiteCookies.py"""
     headers = setNoCacheAndCORSHeaders(request, response)
 
     # Expire the cookies, and return a JSON-encoded success code.
     headers.append(makeDropCookie("samesite_strict", False))
     headers.append(makeDropCookie("samesite_lax", False))
     headers.append(makeDropCookie("samesite_none", False))
+    headers.append(makeDropCookie("samesite_unspecified", False))
     return headers, '{"success": true}'
diff --git a/tests/wpt/web-platform-tests/cookies/resources/dropSameSiteNone.py b/tests/wpt/web-platform-tests/cookies/resources/dropSameSiteNone.py
new file mode 100644
index 00000000000..92d6105afb5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/dropSameSiteNone.py
@@ -0,0 +1,11 @@
+from helpers import makeDropCookie, setNoCacheAndCORSHeaders
+
+def main(request, response):
+    """Respond to `/cookies/resources/dropSameSiteNone.py by dropping the
+    two cookies set by setSameSiteNone.py"""
+    headers = setNoCacheAndCORSHeaders(request, response)
+
+    # Expire the cookies, and return a JSON-encoded success code.
+    headers.append(makeDropCookie("samesite_none_insecure", False))
+    headers.append(makeDropCookie("samesite_none_secure", True))
+    return headers, '{"success": true}'
diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSameSite.py b/tests/wpt/web-platform-tests/cookies/resources/setSameSite.py
index 8ae177607e0..fdf7e7193b4 100644
--- a/tests/wpt/web-platform-tests/cookies/resources/setSameSite.py
+++ b/tests/wpt/web-platform-tests/cookies/resources/setSameSite.py
@@ -1,14 +1,29 @@
-from helpers import makeCookieHeader, readParameter, setNoCacheAndCORSHeaders
+from helpers import makeCookieHeader, setNoCacheAndCORSHeaders
 
 def main(request, response):
-    """Respond to `/cookie/set/samesite?{value}` by setting three cookies:
+    """Respond to `/cookie/set/samesite?{value}` by setting four cookies:
     1. `samesite_strict={value};SameSite=Strict;path=/`
     2. `samesite_lax={value};SameSite=Lax;path=/`
-    3. `samesite_none={value};path=/`"""
+    3. `samesite_none={value};SameSite=None;path=/`
+    4. `samesite_unspecified={value};path=/`
+    Then navigate to a page that will post a message back to the opener with the set cookies"""
     headers = setNoCacheAndCORSHeaders(request, response)
     value = request.url_parts.query
 
+    headers.append(("Content-Type", "text/html; charset=utf-8"))
     headers.append(makeCookieHeader("samesite_strict", value, {"SameSite":"Strict","path":"/"}))
     headers.append(makeCookieHeader("samesite_lax", value, {"SameSite":"Lax","path":"/"}))
-    headers.append(makeCookieHeader("samesite_none", value, {"path":"/"}))
-    return headers, '{"success": true}'
+    headers.append(makeCookieHeader("samesite_none", value, {"SameSite":"None", "path":"/"}))
+    headers.append(makeCookieHeader("samesite_unspecified", value, {"path":"/"}))
+
+    document = """
+<!DOCTYPE html>
+<script>
+  // A same-site navigation, which should attach all cookies including SameSite ones.
+  // This is necessary because this page may have been reached via a cross-site navigation, so
+  // we might not have access to some SameSite cookies from here.
+  window.location = "../samesite/resources/echo-cookies.html";
+</script>
+"""
+
+    return headers, document
diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSameSiteNone.py b/tests/wpt/web-platform-tests/cookies/resources/setSameSiteNone.py
new file mode 100644
index 00000000000..e96cbc22e08
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/setSameSiteNone.py
@@ -0,0 +1,14 @@
+from helpers import makeCookieHeader, setNoCacheAndCORSHeaders
+
+def main(request, response):
+    """Respond to `/cookies/resources/setSameSiteNone.py?{value}` by setting two cookies:
+    1. `samesite_none_insecure={value};SameSite=None;path=/`
+    2. `samesite_none_secure={value};SameSite=None;Secure;path=/`
+    """
+    headers = setNoCacheAndCORSHeaders(request, response)
+    value = request.url_parts.query
+
+    headers.append(makeCookieHeader("samesite_none_insecure", value, {"SameSite":"None", "path":"/"}))
+    headers.append(makeCookieHeader("samesite_none_secure", value, {"SameSite":"None", "Secure":"", "path":"/"}))
+
+    return headers, '{"success": true}'
diff --git a/tests/wpt/web-platform-tests/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.tentative.html b/tests/wpt/web-platform-tests/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.tentative.html
new file mode 100644
index 00000000000..18cf0516e64
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite-none-secure/cookies-without-samesite-must-be-secure.https.tentative.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+promise_test(t => {
+  var value = "" + Math.random();
+  return resetSameSiteNoneCookies(SECURE_ORIGIN, value)
+    .then(_ => {
+      return credFetch(SECURE_ORIGIN + "/cookies/resources/list.py")
+        .then(r => r.json())
+        .then(cookies => {
+          assert_not_equals(cookies["samesite_none_insecure"], value, "Non-Secure SameSite=None cookie is rejected.");
+          assert_equals(cookies["samesite_none_secure"], value, "Secure SameSite=None cookie is set.");
+        })
+    });
+}, "SameSite=None cookies are rejected unless the Secure attribute is set.");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/fetch.html b/tests/wpt/web-platform-tests/cookies/samesite/fetch.html
index 3a2d5bf64c5..6f1d92a6f54 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/fetch.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/fetch.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
 <meta name="timeout" content="long">
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -13,7 +15,7 @@
           return credFetch(target + "/cookies/resources/list.py")
 
             .then(r => r.json())
-            .then(cookies => verifySameSiteCookieState(expectedStatus, value, cookies));
+            .then(cookies => getSameSiteVerifier()(expectedStatus, value, cookies));
         });
     }, title);
   }
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.html b/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.html
index 09f3ee91a21..5fa8ab975de 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -28,7 +30,7 @@
             var reloaded = false;
             var msgHandler = e => {
               try {
-                verifySameSiteCookieState(expectedStatus, value, e.data);
+                getSameSiteVerifier()(expectedStatus, value, e.data);
               } catch (e) {
                 reject(e);
               }
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.html b/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.html
index b7351702b80..47fc9fa34f7 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
 <meta name="timeout" content="long">
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -31,7 +33,7 @@
               window.removeEventListener("message", msgHandler);
               e.source.close();
               try {
-                verifySameSiteCookieState(expectedStatus, value, e.data);
+                getSameSiteVerifier()(expectedStatus, value, e.data);
                 resolve("Popup received the cookie.");
               } catch (e) {
                 reject(e);
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.html b/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.html
index f9449bf46c9..5098dfb4b03 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -18,7 +20,7 @@
             var reloaded = false;
             var msgHandler = e => {
               try {
-                verifySameSiteCookieState(expectedStatus, value, e.data);
+                getSameSiteVerifier()(expectedStatus, value, e.data);
               } catch (e) {
                 reject(e);
               }
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.html b/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.html
index f2bb0cacfbc..75d6024c75c 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
 <meta name="timeout" content="long">
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -20,7 +22,7 @@
               window.removeEventListener("message", msgHandler);
               e.source.close();
               try {
-                verifySameSiteCookieState(expectedStatus, value, e.data);
+                getSameSiteVerifier()(expectedStatus, value, e.data);
                 resolve("Popup received the cookie.");
               } catch (e) {
                 reject(e);
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.html b/tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.html
index c4c3598ca44..11d34bb9fcc 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
 <meta name="timeout" content="long">
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -19,7 +21,7 @@
             var reloaded = false;
             var msgHandler = e => {
               try {
-                verifySameSiteCookieState(expectedStatus, value, e.data);
+                getSameSiteVerifier()(expectedStatus, value, e.data);
               } catch (e) {
                 reject(e);
               }
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/iframe.html b/tests/wpt/web-platform-tests/cookies/samesite/iframe.html
index e511128f963..4cce83081e6 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/iframe.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/iframe.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
 <meta name="timeout" content="long">
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -22,7 +24,7 @@
                 document.body.removeChild(iframe);
                 window.removeEventListener("message", msgHandler);
                 try {
-                  verifySameSiteCookieState(expectedStatus, value, e.data);
+                  getSameSiteVerifier()(expectedStatus, value, e.data);
                   resolve();
                 } catch(e) {
                   reject(e);
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/img.html b/tests/wpt/web-platform-tests/cookies/samesite/img.html
index bca84cbd28b..071c24fb30e 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/img.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/img.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
 <meta name="timeout" content="long">
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -38,15 +40,21 @@
       var value = "" + Math.random();
       return resetSameSiteCookies(origin, value)
         .then(_ => {
-          return Promise.all([
-            assert_cookie_present(target, "samesite_none", value),
-            expectedStatus == SameSiteStatus.STRICT ?
-              assert_cookie_present(target, "samesite_strict", value) :
-              assert_cookie_absent(target, "samesite_strict", value),
-            expectedStatus == SameSiteStatus.CROSS_SITE ?
-              assert_cookie_absent(target, "samesite_lax", value) :
-              assert_cookie_present(target, "samesite_lax", value)
-          ]);
+          var asserts = [assert_cookie_present(target, "samesite_none", value),
+                         expectedStatus == SameSiteStatus.STRICT ?
+                           assert_cookie_present(target, "samesite_strict", value) :
+                           assert_cookie_absent(target, "samesite_strict", value),
+                         expectedStatus == SameSiteStatus.CROSS_SITE ?
+                           assert_cookie_absent(target, "samesite_lax", value) :
+                           assert_cookie_present(target, "samesite_lax", value)];
+          if (location.search && location.search === "?samesite-by-default-cookies.tentative") {
+            asserts.push(expectedStatus == SameSiteStatus.CROSS_SITE ?
+                           assert_cookie_absent(target, "samesite_unspecified", value) :
+                           assert_cookie_present(target, "samesite_unspecified", value));
+          } else {
+            asserts.push(assert_cookie_present(target, "samesite_unspecified", value));
+          }
+          return Promise.all(asserts);
         });
     }, title);
   }
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/echo-cookies.html b/tests/wpt/web-platform-tests/cookies/samesite/resources/echo-cookies.html
new file mode 100644
index 00000000000..9b8b286015f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/resources/echo-cookies.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script>
+  window.opener.postMessage({ type: 'COOKIES_SET', cookies: document.cookie }, '*');
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/resources/navigate.html b/tests/wpt/web-platform-tests/cookies/samesite/resources/navigate.html
new file mode 100644
index 00000000000..ef40642a5d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/resources/navigate.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  window.addEventListener('load', function() {
+    window.opener.postMessage({ type: 'READY' }, '*');
+  });
+
+  window.addEventListener('message', function(e) {
+    if (ORIGIN !== window.location.origin)
+      return;
+    if (window.location.origin !== e.origin)
+      return;
+
+    if (e.data.type === "navigate") {
+      window.location = e.data.url;
+    }
+
+    if (e.data.type === "post-form") {
+      var f = document.createElement('form');
+      f.action = e.data.url;
+      f.method = "POST";
+      document.body.appendChild(f);
+      f.submit();
+    }
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/setcookie-lax.html b/tests/wpt/web-platform-tests/cookies/samesite/setcookie-lax.html
index 2826f676a5b..04b2ce264c8 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/setcookie-lax.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/setcookie-lax.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -13,6 +15,7 @@
     assert_dom_cookie("samesite_strict", e.data.value, true);
     assert_dom_cookie("samesite_lax", e.data.value, true);
     assert_dom_cookie("samesite_none", e.data.value, true);
+    assert_dom_cookie("samesite_unspecified", e.data.value, true);
     w.close();
   }, "Same-site window should be able to set `SameSite=Lax` or `SameSite=Strict` cookies.");
 
@@ -25,6 +28,8 @@
     assert_dom_cookie("samesite_strict", e.data.value, false);
     assert_dom_cookie("samesite_lax", e.data.value, false);
     assert_dom_cookie("samesite_none", e.data.value, true);
+    assert_dom_cookie("samesite_unspecified", e.data.value,
+      location.search !== "?samesite-by-default-cookies.tentative");
     w.close();
   }, "Cross-site window shouldn't be able to set `SameSite=Lax` or `SameSite=Strict` cookies.");
 </script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/setcookie-navigation.html b/tests/wpt/web-platform-tests/cookies/samesite/setcookie-navigation.html
new file mode 100644
index 00000000000..3663aa28a20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/setcookie-navigation.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function assert_samesite_cookies_present(cookies, value) {
+    let samesite_cookie_names = ["samesite_strict", "samesite_lax", "samesite_none", "samesite_unspecified"];
+    for (name of samesite_cookie_names) {
+      let re = new RegExp("(?:^|; )" + name + "=" + value + "(?:$|;)");
+      assert_true(re.test(cookies), "`" + name + "=" + value + "` in cookies");
+    }
+  }
+
+  // Navigate from ORIGIN to |origin_to|, expecting the navigation to set SameSite
+  // cookies on |origin_to|.
+  function navigate_test(method, origin_to, title) {
+    promise_test(async function(t) {
+      // The cookies don't need to be cleared on each run because |value| is
+      // a new random value on each run, so on each run we are overwriting and
+      // checking for a cookie with a different random value.
+      let value = "" + Math.random();
+      let url_from = ORIGIN + "/cookies/samesite/resources/navigate.html";
+      let url_to = origin_to + "/cookies/resources/setSameSite.py?" + value;
+      var w = window.open(url_from);
+      await wait_for_message('READY', ORIGIN);
+      assert_equals(ORIGIN, window.origin);
+      assert_equals(ORIGIN, w.origin);
+      let command = (method === "POST") ? "post-form" : "navigate";
+      w.postMessage({ type: command, url: url_to }, "*");
+      let message = await wait_for_message('COOKIES_SET', origin_to);
+      assert_samesite_cookies_present(message.data.cookies, value);
+      w.close();
+    }, title);
+  }
+
+  navigate_test("GET", ORIGIN, "Same-site top-level navigation should be able to set SameSite=* cookies.");
+  navigate_test("GET", CROSS_SITE_ORIGIN, "Cross-site top-level navigation should be able to set SameSite=* cookies.");
+  navigate_test("POST", ORIGIN, "Same-site top-level POST should be able to set SameSite=* cookies.");
+  navigate_test("POST", CROSS_SITE_ORIGIN, "Cross-site top-level POST should be able to set SameSite=* cookies.");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.html b/tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.html
index fd9c7a6d5a8..d8bc112344c 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.html
@@ -1,5 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -15,7 +17,7 @@
             var reloaded = false;
             var msgHandler = e => {
               try {
-                verifySameSiteCookieState(expectedStatus, value, e.data);
+                getSameSiteVerifier()(expectedStatus, value, e.data);
               } catch (e) {
                 reject(e);
               }
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/window-open.html b/tests/wpt/web-platform-tests/cookies/samesite/window-open.html
index 1aa8e5e80bb..b7dc8361ec2 100644
--- a/tests/wpt/web-platform-tests/cookies/samesite/window-open.html
+++ b/tests/wpt/web-platform-tests/cookies/samesite/window-open.html
@@ -1,5 +1,8 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
+<meta name="timeout" content="long">
+<meta name="variant" content="">
+<meta name="variant" content="?samesite-by-default-cookies.tentative">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/cookies/resources/cookie-helper.sub.js"></script>
@@ -16,7 +19,7 @@
               window.removeEventListener("message", msgHandler);
               w.close();
               try {
-                verifySameSiteCookieState(expectedStatus, value, e.data);
+                getSameSiteVerifier()(expectedStatus, value, e.data);
                 resolve("Popup received the cookie.");
               } catch (e) {
                 reject(e);
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-3.html b/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-3.html
new file mode 100644
index 00000000000..4c37be4ba2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-3.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#bfc-next-to-float" title="9.5 Floats">
+<meta name="assert" content="Although the 'clear' property isn't specified in this test, a new formatting context that doesn't fit below a float that would otherwise be adjoining will need to separate its margin from the float, so that it doesn't affect the float. This is very similar to clearance.">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="display: flow-root; width: 100px; background: red; position: relative;">
+  <div>
+    <div style="float: right; width: 50px; height: 30px; background: green;"></div>
+    <div>
+      <div style="overflow: hidden; width: 100px; height: 70px; margin-top: 100px; background: green;"></div>
+    </div>
+    <div style="position: absolute; width: 50px; height: 30px; top: 0; left: 0; background: green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/inheritance.html b/tests/wpt/web-platform-tests/css/css-color-adjust/inheritance.html
new file mode 100644
index 00000000000..c48d2ade7bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color-adjust/inheritance.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>Inheritance of CSS Color Adjust properties</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-adjust/#property-index">
+<meta name="assert" content="Properties inherit according to the spec.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/inheritance-testcommon.js"></script>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+  assert_inherited('color-scheme', 'auto', 'light dark');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-computed.tentative.html b/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-computed.tentative.html
new file mode 100644
index 00000000000..74d1bb919dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-computed.tentative.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<title>CSS Color Adjust: getComputedStyle for color-scheme</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-adjust/#color-scheme-prop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target"></div>
+<script>
+  test_computed_value("color-scheme", "", "auto");
+  test_computed_value("color-scheme", "auto");
+  test_computed_value("color-scheme", "light dark");
+  test_computed_value("color-scheme", "dark light");
+  test_computed_value("color-scheme", "light unknown");
+  test_computed_value("color-scheme", "only light");
+  test_computed_value("color-scheme", "light light");
+  test_computed_value("color-scheme", "light only");
+  // reserved and css-wide keywords.
+  test_computed_value("color-scheme", "initial", "auto");
+  test_computed_value("color-scheme", "inherit", "auto");
+  test_computed_value("color-scheme", "unset", "auto");
+  test_computed_value("color-scheme", "revert", "auto");
+  test_computed_value("color-scheme", "default", "auto");
+  test_computed_value("color-scheme", "none", "auto");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-invalid.html b/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-invalid.html
new file mode 100644
index 00000000000..0def5b3fc10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-invalid.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>CSS Color Adjust: parsing color-scheme with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-adjust/#color-scheme-prop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+  test_invalid_value("color-scheme", "none");
+  test_invalid_value("color-scheme", "only");
+  test_invalid_value("color-scheme", "only only");
+  test_invalid_value("color-scheme", "only auto");
+  test_invalid_value("color-scheme", "only light dark");
+  test_invalid_value("color-scheme", "only light light");
+  test_invalid_value("color-scheme", "only light purple");
+  test_invalid_value("color-scheme", "auto dark");
+  test_invalid_value("color-scheme", "auto purple");
+  test_invalid_value("color-scheme", "light auto");
+  test_invalid_value("color-scheme", "light none");
+  test_invalid_value("color-scheme", "light, dark");
+  test_invalid_value("color-scheme", "light inherit");
+  test_invalid_value("color-scheme", "light initial");
+  test_invalid_value("color-scheme", "light unset");
+  test_invalid_value("color-scheme", "light revert");
+  test_invalid_value("color-scheme", "light default");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-valid.html b/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-valid.html
new file mode 100644
index 00000000000..433610061f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color-adjust/parsing/color-scheme-valid.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>CSS Color Adjust: parsing color-scheme with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-adjust/#color-scheme-prop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script>
+  test_valid_value("color-scheme", "auto");
+  test_valid_value("color-scheme", "light");
+  test_valid_value("color-scheme", "dark");
+  test_valid_value("color-scheme", "light dark");
+  test_valid_value("color-scheme", "dark light");
+  test_valid_value("color-scheme", "only light");
+  test_valid_value("color-scheme", "light only");
+  test_valid_value("color-scheme", "light light");
+  test_valid_value("color-scheme", "dark dark");
+  test_valid_value("color-scheme", "light purple");
+  test_valid_value("color-scheme", "purple dark interesting");
+  test_valid_value("color-scheme", "inherit");
+  test_valid_value("color-scheme", "initial");
+  test_valid_value("color-scheme", "unset");
+  test_valid_value("color-scheme", "revert");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-001.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-001.html
new file mode 100644
index 00000000000..70caa578e88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-001.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' applies to 'table' elements</title>
+
+  <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-047-ref.html">
+
+  <meta content="This test checks that paint containment applies to table elements. Therefore the content of the table element should be clipped to the padding edge of its principal box." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#table
+    {
+      display: table;
+      font-family: monospace;
+      font-size: 100px;
+      table-layout: fixed;
+      width: 4ch;
+      contain: paint;
+    }
+
+  div.cell
+    {
+      display: table-cell;
+      color: green;
+    }
+  span
+    {
+      background-color: red;
+      color: yellow;
+    }
+  </style>
+
+  <p>Test passes if there is <strong>no red</strong>.
+
+  <div id="table">
+    <div class="cell">PASS<span>FAIL</span></div>
+  </div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-002.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-002.html
new file mode 100644
index 00000000000..a6ce97ec15b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-table-002.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' applies to 'table' elements</title>
+
+  <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-047-ref.html">
+
+  <meta content="This test checks that paint containment applies to table elements. Therefore the content of the table element (including its caption) should be clipped to the padding edge of its principal box." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#table
+    {
+      display: table;
+      font-family: monospace;
+      font-size: 100px;
+      table-layout: fixed;
+      width: 4ch;
+      contain: paint;
+    }
+  div.caption
+    {
+      display: table-caption;
+      color: green;
+      /* We have to limit the width of the caption here, or else the caption's
+         intrinsic width (including the "FAIL" span) would "prop up" the width
+         of the table to be a size that'd be larger than its specified width.
+         Really, we want the table to be *only* 4 characters wide (as wide as
+         the text "PASS"), with "FAIL" overflowing and getting clipped by
+         "contain:paint" on the table wrapper box. */
+      width: 4ch;
+    }
+  span
+    {
+      background-color: red;
+      color: yellow;
+    }
+  </style>
+
+  <p>Test passes if there is <strong>no red</strong>.
+
+  <div id="table">
+    <div class="caption">
+      PASS<span>FAIL</span>
+    </div>
+  </div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-subgrid-001.html b/tests/wpt/web-platform-tests/css/css-contain/contain-subgrid-001.html
new file mode 100644
index 00000000000..59a104bfbad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-subgrid-001.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html lang=en>
+  <meta charset=utf-8>
+  <title>CSS-contain test: layout/paint containment on subgrid</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+  <meta name=assert content="layout/paint containment inhibits subgrid">
+  <link rel="match" href="reference/contain-subgrid-001.html">
+  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-layout">
+  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-grid-2/">
+
+<style>
+.grid {
+  display: grid;
+  width: 40px;
+  height: 40px;
+  grid: [a] repeat(2,15px) [b] / [a] repeat(2,15px) [b];
+  gap: 10px;
+}
+
+.subgrid {
+  display: grid;
+  grid: subgrid;
+  background: lightgrey;
+  grid-area:1/1/3/3;
+}
+
+.layout { contain: layout; }
+.paint { contain: paint; }
+
+.inner {
+  background: blue;
+  grid-area:a/a/b/b;
+}
+.p {
+  place-self: start;
+  width:100%;
+  height:100%;
+}
+</style>
+
+<div class="grid"><div class="subgrid layout"><div class="inner"></div></div></div>
+<div class="grid"><div class="subgrid paint"><div class="inner"></div></div></div>
+<div class="grid"><div class="subgrid layout"><div class="inner p"></div></div></div>
+<div class="grid"><div class="subgrid paint"><div class="inner p"></div></div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/reference/contain-subgrid-001.html b/tests/wpt/web-platform-tests/css/css-contain/reference/contain-subgrid-001.html
new file mode 100644
index 00000000000..ab0d1fede53
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/reference/contain-subgrid-001.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<html lang=en>
+  <meta charset=utf-8>
+  <title>CSS-contain reference: layout/paint containment on subgrid</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+
+<style>
+.grid {
+  display: grid;
+  width: 40px;
+  height: 40px;
+  grid: [a] repeat(2,15px) [b] / [a] repeat(2,15px) [b];
+  gap: 10px;
+}
+
+.subgrid {
+  display: grid;
+  grid: none;
+  background: lightgrey;
+  grid-area:1/1/3/3;
+}
+
+.layout { contain: layout; }
+.paint { contain: paint; }
+
+.inner {
+  background: blue;
+  grid-area:a/a/b/b;
+}
+</style>
+
+<div class="grid"><div class="subgrid layout"><div class="inner"></div></div></div>
+<div class="grid"><div class="subgrid paint"><div class="inner"></div></div></div>
+<div class="grid"><div class="subgrid layout"><div class="inner"></div></div></div>
+<div class="grid"><div class="subgrid paint"><div class="inner"></div></div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-computed.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-computed.html
new file mode 100644
index 00000000000..68ad0cd8362
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-computed.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Scroll Snap: getComputedValue().scrollPaddingBlock</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#propdef-scroll-padding-block">
+<meta name="assert" content="scroll-padding-block computed value is per side, either the keyword auto or a computed <length-percentage> value.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+<script>
+test_computed_value("scroll-padding-block-start", "auto");
+test_computed_value("scroll-padding-block-start", "10px");
+test_computed_value("scroll-padding-block-start", "20%");
+test_computed_value("scroll-padding-block-start", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-block-start", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-block-start", "calc(50% + 60px)");
+
+
+test_computed_value("scroll-padding-block-end", "auto");
+test_computed_value("scroll-padding-block-end", "10px");
+test_computed_value("scroll-padding-block-end", "20%");
+test_computed_value("scroll-padding-block-end", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-block-end", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-block-end", "calc(50% + 60px)");
+
+
+test_computed_value("scroll-padding-block", "auto");
+test_computed_value("scroll-padding-block", "10px");
+test_computed_value("scroll-padding-block", "20%");
+test_computed_value("scroll-padding-block", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-block", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-block", "calc(50% + 60px)");
+
+test_computed_value("scroll-padding-block", "1px 2px");
+test_computed_value("scroll-padding-block", "1px auto");
+test_computed_value("scroll-padding-block", "auto auto", "auto");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-invalid.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-invalid.html
new file mode 100644
index 00000000000..206e6f5da89
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-block-invalid.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Scroll Snap Test: scroll-padding-block with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#propdef-scroll-padding-block">
+<meta name="assert" content="scroll-padding-block supports only the grammar '[ auto | <length-percentage> ]{1,2}'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("scroll-padding-block-start", "none");
+test_invalid_value("scroll-padding-block-start", "-10px");
+test_invalid_value("scroll-padding-block-start", "10px 20%");
+
+
+test_invalid_value("scroll-padding-block-end", "none");
+test_invalid_value("scroll-padding-block-end", "-10px");
+test_invalid_value("scroll-padding-block-end", "10px 20%");
+
+
+test_invalid_value("scroll-padding-block", "none");
+test_invalid_value("scroll-padding-block", "-10px");
+test_invalid_value("scroll-padding-block", "10px 20px 30px 40px 50px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-computed.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-computed.html
new file mode 100644
index 00000000000..5a5123a6dac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-computed.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Scroll Snap: getComputedValue().scrollPadding</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#propdef-scroll-padding">
+<meta name="assert" content="scroll-padding computed value is per side, either the keyword auto or a computed <length-percentage> value.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+<script>
+test_computed_value("scroll-padding-top", "auto");
+test_computed_value("scroll-padding-top", "0", "0px");
+test_computed_value("scroll-padding-top", "10px");
+test_computed_value("scroll-padding-top", "20%");
+test_computed_value("scroll-padding-top", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-top", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-top", "calc(50% + 60px)");
+
+
+test_computed_value("scroll-padding-right", "auto");
+test_computed_value("scroll-padding-right", "0", "0px");
+test_computed_value("scroll-padding-right", "10px");
+test_computed_value("scroll-padding-right", "20%");
+test_computed_value("scroll-padding-right", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-right", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-right", "calc(50% + 60px)");
+
+
+test_computed_value("scroll-padding-bottom", "auto");
+test_computed_value("scroll-padding-bottom", "0", "0px");
+test_computed_value("scroll-padding-bottom", "10px");
+test_computed_value("scroll-padding-bottom", "20%");
+test_computed_value("scroll-padding-bottom", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-bottom", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-bottom", "calc(50% + 60px)");
+
+
+test_computed_value("scroll-padding-left", "auto");
+test_computed_value("scroll-padding-left", "0", "0px");
+test_computed_value("scroll-padding-left", "10px");
+test_computed_value("scroll-padding-left", "20%");
+test_computed_value("scroll-padding-left", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-left", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-left", "calc(50% + 60px)");
+
+
+test_computed_value("scroll-padding", "auto");
+test_computed_value("scroll-padding", "10px");
+test_computed_value("scroll-padding", "0", "0px");
+test_computed_value("scroll-padding", "20%");
+test_computed_value("scroll-padding", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding", "calc(10px - 0.5em)", "0px");
+
+test_computed_value("scroll-padding", "1px 2px");
+test_computed_value("scroll-padding", "1px 2px 3%");
+test_computed_value("scroll-padding", "1px 2px 3% 4px");
+test_computed_value("scroll-padding", "1px auto");
+test_computed_value("scroll-padding", "0 0 0 0", "0px");
+test_computed_value("scroll-padding", "auto auto auto auto", "auto");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-inline-computed.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-inline-computed.html
new file mode 100644
index 00000000000..d753bacbca0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-inline-computed.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Scroll Snap: getComputedValue().scrollPaddingInline</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#propdef-scroll-padding-inline">
+<meta name="assert" content="scroll-padding-inline computed value is per side, either the keyword auto or a computed <length-percentage> value.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+<script>
+test_computed_value("scroll-padding-inline-start", "auto");
+test_computed_value("scroll-padding-inline-start", "10px");
+test_computed_value("scroll-padding-inline-start", "20%");
+test_computed_value("scroll-padding-inline-start", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-inline-start", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-inline-start", "calc(50% + 60px)");
+
+
+test_computed_value("scroll-padding-inline-end", "auto");
+test_computed_value("scroll-padding-inline-end", "10px");
+test_computed_value("scroll-padding-inline-end", "20%");
+test_computed_value("scroll-padding-inline-end", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-inline-end", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-inline-end", "calc(50% + 60px)");
+
+
+test_computed_value("scroll-padding-inline", "auto");
+test_computed_value("scroll-padding-inline", "10px");
+test_computed_value("scroll-padding-inline", "20%");
+test_computed_value("scroll-padding-inline", "calc(10px + 0.5em)", "30px");
+test_computed_value("scroll-padding-inline", "calc(10px - 0.5em)", "0px");
+test_computed_value("scroll-padding-inline", "calc(50% + 60px)");
+
+test_computed_value("scroll-padding-inline", "1px 2px");
+test_computed_value("scroll-padding-inline", "1px auto");
+test_computed_value("scroll-padding-inline", "auto auto", "auto");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-inline-invalid.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-inline-invalid.html
new file mode 100644
index 00000000000..0cf3fa7353f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-inline-invalid.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Scroll Snap Test: scroll-padding-inline with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#propdef-scroll-padding-inline">
+<meta name="assert" content="scroll-padding-inline supports only the grammar '[ auto | <length-percentage> ]{1,2}'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("scroll-padding-inline-start", "none");
+test_invalid_value("scroll-padding-inline-start", "-10px");
+test_invalid_value("scroll-padding-inline-start", "10px 20%");
+
+
+test_invalid_value("scroll-padding-inline-end", "none");
+test_invalid_value("scroll-padding-inline-end", "-10px");
+test_invalid_value("scroll-padding-inline-end", "10px 20%");
+
+
+test_invalid_value("scroll-padding-inline", "none");
+test_invalid_value("scroll-padding-inline", "-10px");
+test_invalid_value("scroll-padding-inline", "10px 20px 30px 40px 50px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-invalid.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-invalid.html
index 9b24a539f7a..e060fcdc0ec 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/parsing/scroll-padding-invalid.html
@@ -13,22 +13,32 @@
 <script>
 test_invalid_value("scroll-padding-top", "20");
 test_invalid_value("scroll-padding-top", "-20px");
+test_invalid_value("scroll-padding-top", "none");
+test_invalid_value("scroll-padding-top", "10px 20%");
 
 
 test_invalid_value("scroll-padding-right", "20");
 test_invalid_value("scroll-padding-right", "-20px");
+test_invalid_value("scroll-padding-right", "none");
+test_invalid_value("scroll-padding-right", "10px 20%");
 
 
 test_invalid_value("scroll-padding-bottom", "20");
 test_invalid_value("scroll-padding-bottom", "-20px");
+test_invalid_value("scroll-padding-bottom", "none");
+test_invalid_value("scroll-padding-bottom", "10px 20%");
 
 
 test_invalid_value("scroll-padding-left", "20");
 test_invalid_value("scroll-padding-left", "-20px");
+test_invalid_value("scroll-padding-left", "none");
+test_invalid_value("scroll-padding-left", "10px 20%");
 
 
 test_invalid_value("scroll-padding", "20");
 test_invalid_value("scroll-padding", "-20px");
+test_invalid_value("scroll-padding", "none");
+test_invalid_value("scroll-padding", "10px 20px 30px 40px 50px");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-018.html b/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-018.html
new file mode 100644
index 00000000000..ade2b6d4d66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-018.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CSS Text — out-of-flow element adjacent to a potential line-break</title>
+<meta name=assert content="An abs-pos out-of-flow must not introduce a soft line break
+                           between the border and content of the enclosing inline">
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="reference/line-breaking-018-ref.html">
+<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
+<style>
+.outer { float: left; padding: 0 1em; margin: 1em; border: 1px solid silver; }
+
+.outer div { font-family: monospace; line-height: 2; margin: 1em 0; border: 1px dotted silver; }
+
+.test20 div { width: 20ch; }
+.test27 div { width: 27ch; }
+.test30 div { width: 30ch; }
+
+b { color: blue; border-left: 2px solid red; border-right: 2px solid green; }
+
+.test::before,
+.test::after,
+.before,
+.after { position: absolute; }
+
+.test::before { content: ""; }
+.test::after { content: ""; }
+</style>
+
+<div>Test passes if all the examples in each group render the same:</div>
+
+<div class="outer test30">
+  <!-- Using ::before and ::after to insert abs-pos elements with empty content: -->
+  <div>
+  Preceding text <b class=test>target element</b> following text.
+  </div>
+  <!-- With explicit spans just inside the target element: -->
+  <div>
+  Preceding text <b><span class=before></span>target element<span class=after></span></b> following text.
+  </div>
+  <!-- With explicit spans just outside the target element: -->
+  <div>
+  Preceding text <span class=before></span><b>target element</b><span class=after></span> following text.
+  </div>
+  <!-- With explicit line breaks: -->
+  <div>
+  Preceding text <b>target element</b><br>following text.
+  </div>
+</div>
+
+<div class="outer test27">
+  <div>
+  Preceding text <b class=test>target element</b> following text.
+  </div>
+  <div>
+  Preceding text <b><span class=before></span>target element<span class=after></span></b> following text.
+  </div>
+  <div>
+  Preceding text <span class=before></span><b>target element</b><span class=after></span> following text.
+  </div>
+  <div>
+  Preceding text <b>target<br>element</b> following text.
+  </div>
+</div>
+
+<div class="outer test20">
+  <div>
+  Preceding text <b class=test>target element</b> following text.
+  </div>
+  <div>
+  Preceding text <b><span class=before></span>target element<span class=after></span></b> following text.
+  </div>
+  <div>
+  Preceding text <span class=before></span><b>target element</b><span class=after></span> following text.
+  </div>
+  <div>
+  Preceding text<br><b>target element</b><br>following text.
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-019.html b/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-019.html
new file mode 100644
index 00000000000..e755eff3813
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-breaking/line-breaking-019.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CSS Text — out-of-flow element adjacent to a potential line-break</title>
+<meta name=assert content="The anchor of an out-of-flow should not migrate across a soft line break">
+<!-- NOTE: I'm not sure the spec explicitly addresses this exact point, but it seems like a clear
+           bug in Firefox, hence this test (which passes as expected in Chrome and Safari). -->
+<link rel=help href="https://www.w3.org/TR/css-text-3/#line-break-details">
+<link rel=match href="reference/line-breaking-019-ref.html">
+<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
+<style>
+.outer { float: left; padding: 0 1em; margin: 1em; border: 1px solid silver; }
+
+.outer div { font-family: monospace; line-height: 2; margin: 1em 0; border: 1px dotted silver; }
+
+.test20 div { width: 20ch; }
+.test27 div { width: 27ch; }
+.test30 div { width: 30ch; }
+
+b { color: blue; border-left: 2px solid red; border-right: 2px solid green; }
+
+/* adjust for the width of the target element's border */
+div > .before { margin-left: 2px; }
+div > .after { margin-left: -2px; }
+
+.test::before,
+.test::after,
+.before,
+.after { position: absolute; font-size: 0.5em; }
+
+.test::before { content: "before"; }
+.test::after { content: "after"; }
+
+.before,
+.test::before { color: red; font-weight: normal; }
+.after,
+.test::after { color: green; font-weight: normal; }
+</style>
+
+<div>Test passes if all the examples in each group render the same:</div>
+
+<div class="outer test30">
+  <!-- Using ::before and ::after to insert abs-pos elements with non-empty content: -->
+  <div>
+  Preceding text <b class=test>target element</b> following text.
+  </div>
+  <!-- With explicit spans just inside the target element: -->
+  <div>
+  Preceding text <b><span class=before>before</span>target element<span class=after>after</span></b> following text.
+  </div>
+  <!-- With explicit spans just outside the target element: -->
+  <div>
+  Preceding text <span class=before>before</span><b>target element</b><span class=after>after</span> following text.
+  </div>
+  <!-- With explicit line breaks: -->
+  <div>
+  Preceding text <span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+</div>
+
+<div class="outer test27">
+  <div>
+  Preceding text <b class=test>target element</b> following text.
+  </div>
+  <div>
+  Preceding text <b><span class=before>before</span>target element<span class=after>after</span></b> following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target element</b><span class=after>after</span> following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target<br>element</b><span class=after>after</span> following text.
+  </div>
+</div>
+
+<div class="outer test20">
+  <div>
+  Preceding text <b class=test>target element</b> following text.
+  </div>
+  <div>
+  Preceding text <b><span class=before>before</span>target element<span class=after>after</span></b> following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target element</b><span class=after>after</span> following text.
+  </div>
+  <div>
+  Preceding text<br><span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-018-ref.html b/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-018-ref.html
new file mode 100644
index 00000000000..e40669b7429
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-018-ref.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CSS Text — reference</title>
+<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
+<style>
+.outer { float: left; padding: 0 1em; margin: 1em; border: 1px solid silver; }
+
+.outer div { font-family: monospace; line-height: 2; margin: 1em 0; border: 1px dotted silver; }
+
+.test20 div { width: 20ch; }
+.test27 div { width: 27ch; }
+.test30 div { width: 30ch; }
+
+b { color: blue; border-left: 2px solid red; border-right: 2px solid green; }
+</style>
+
+<div>Test passes if all the examples in each group render the same:</div>
+
+<div class="outer test30">
+  <div>
+  Preceding text <b>target element</b><br>following text.
+  </div>
+  <div>
+  Preceding text <b>target element</b><br>following text.
+  </div>
+  <div>
+  Preceding text <b>target element</b><br>following text.
+  </div>
+  <div>
+  Preceding text <b>target element</b><br>following text.
+  </div>
+</div>
+
+<div class="outer test27">
+  <div>
+  Preceding text <b>target<br>element</b> following text.
+  </div>
+  <div>
+  Preceding text <b>target<br>element</b> following text.
+  </div>
+  <div>
+  Preceding text <b>target<br>element</b> following text.
+  </div>
+  <div>
+  Preceding text <b>target<br>element</b> following text.
+  </div>
+</div>
+
+<div class="outer test20">
+  <div>
+  Preceding text<br><b>target element</b><br>following text.
+  </div>
+  <div>
+  Preceding text<br><b>target element</b><br>following text.
+  </div>
+  <div>
+  Preceding text<br><b>target element</b><br>following text.
+  </div>
+  <div>
+  Preceding text<br><b>target element</b><br>following text.
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-019-ref.html b/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-019-ref.html
new file mode 100644
index 00000000000..4a7772aa290
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/line-breaking/reference/line-breaking-019-ref.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CSS Text — reference</title>
+<link rel=author title="Jonathan Kew" href="jkew@mozilla.com">
+<style>
+.outer { float: left; padding: 0 1em; margin: 1em; border: 1px solid silver; }
+
+.outer div { font-family: monospace; line-height: 2; margin: 1em 0; border: 1px dotted silver; }
+
+.test20 div { width: 20ch; }
+.test27 div { width: 27ch; }
+.test30 div { width: 30ch; }
+
+b { color: blue; border-left: 2px solid red; border-right: 2px solid green; }
+
+/* adjust for the width of the target element's border */
+div > .before { margin-left: 2px; }
+div > .after { margin-left: -2px; }
+
+.before,
+.after { position: absolute; font-size: 0.5em; }
+
+.before { color: red; font-weight: normal; }
+.after { color: green; font-weight: normal; }
+</style>
+
+<div>Test passes if all the examples in each group render the same:</div>
+
+<div class="outer test30">
+  <div>
+  Preceding text <span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+</div>
+
+<div class="outer test27">
+  <div>
+  Preceding text <span class=before>before</span><b>target<br>element</b><span class=after>after</span> following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target<br>element</b><span class=after>after</span> following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target<br>element</b><span class=after>after</span> following text.
+  </div>
+  <div>
+  Preceding text <span class=before>before</span><b>target<br>element</b><span class=after>after</span> following text.
+  </div>
+</div>
+
+<div class="outer test20">
+  <div>
+  Preceding text<br><span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+  <div>
+  Preceding text<br><span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+  <div>
+  Preceding text<br><span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+  <div>
+  Preceding text<br><span class=before>before</span><b>target element</b><span class=after>after</span><br>following text.
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033-ref.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033-ref.html
index 5af9912b28f..7bbacef735c 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033-ref.html
@@ -3,6 +3,6 @@
 <p>
   Should read "Pass" below
 </p>
-<p>
+<p style="font-kerning: none">
   Pass
 </p>
diff --git a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033.html b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033.html
index 8bc66177f65..7a764cdf680 100644
--- a/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033.html
+++ b/tests/wpt/web-platform-tests/css/css-text/text-transform/text-transform-capitalize-033.html
@@ -9,6 +9,6 @@
 <p>
   Should read "Pass" below
 </p>
-<p style="text-transform: capitalize">
+<p style="text-transform: capitalize; font-kerning: none">
   p<span style="position: absolute"></span>ass
 </p>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet-ref.html b/tests/wpt/web-platform-tests/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet-ref.html
new file mode 100644
index 00000000000..93b4ae982e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<title>CSS Transitions Test: Reference</title>
+<div style="color:green">This text should be green on load.</div>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html b/tests/wpt/web-platform-tests/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html
new file mode 100644
index 00000000000..4967eabda86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<title>CSS Transitions Test: No color transition from initial to blocking stylesheet value</title>
+<link rel="help" href="https://drafts.csswg.org/css-transitions/#style-change-event">
+<link rel="match" href="no-transition-from-ua-to-blocking-stylesheet-ref.html">
+<link rel="stylesheet" href="support/a-green-transition.css">
+<div class="a">This text should be green on load.</div>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/support/a-green-transition.css b/tests/wpt/web-platform-tests/css/css-transitions/support/a-green-transition.css
new file mode 100644
index 00000000000..3f68e53cd6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transitions/support/a-green-transition.css
@@ -0,0 +1 @@
+.a { color: green; transition: 10s; transition-timing-function: step-end; }
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped-ref.html b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped-ref.html
new file mode 100644
index 00000000000..60b0b6c1173
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>backdrop-filter: Basic operation of filter</title>
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+
+
+
+<p>Expected: A green box</p>
+<div id="colorbox"></div>
+
+
+
+
+<style>
+div {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    left: 10px;
+    top: 50px;
+    background: green;
+}
+</style>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped.html b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped.html
new file mode 100644
index 00000000000..bc25b25944f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-clipped.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>backdrop-filter: A rounded-corner clip rect parent should not form a Backdrop Root</title>
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
+<link rel="match"  href="backdrop-filter-clipped-ref.html">
+
+<p>Expected: A green box</p>
+<div class="colorbox"></div>
+<div class="clipper">
+  <div class="filterbox"></div>
+</div>
+
+<style>
+div {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    left: 10px;
+    top: 50px;
+}
+.colorbox {
+    background: #ff7fff;
+}
+.clipper {
+    overflow: hidden;
+    border-radius: 0.001px;
+}
+.filterbox {
+    top:0;
+    left:0;
+    backdrop-filter: invert(1);
+}
+</style>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update-ref.html b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update-ref.html
new file mode 100644
index 00000000000..ec4d80628b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>backdrop-filter: Update filter value</title>
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+
+
+
+
+<p>Expected: A green box</p>
+<div id="colorbox"></div>
+
+
+<style>
+div {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    left: 10px;
+    top: 50px;
+    background: green;
+}
+</style>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update.html b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update.html
new file mode 100644
index 00000000000..de629a1fb2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-update.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<meta charset="utf-8">
+<title>backdrop-filter: Update filter value</title>
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
+<link rel="match"  href="backdrop-filter-update-ref.html">
+
+<p>Expected: A green box</p>
+<div id="colorbox"></div>
+<div id="filterbox"></div>
+
+<style>
+div {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    left: 10px;
+    top: 50px;
+}
+#colorbox {
+    background: #ff7fff;
+}
+#filterbox {
+    backdrop-filter: invert(0);
+}
+</style>
+
+<script>
+window.onload = function(e) {
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      let filt = document.getElementById("filterbox");
+      filt.style.backdropFilter = "invert(1)";
+	  document.documentElement.classList.remove('reftest-wait');
+    });
+  });
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-document.html b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-document.html
new file mode 100644
index 00000000000..c054ffca9c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-document.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+#targetDiv {
+  width: 200px;
+  height: 200px;
+  overflow: scroll;
+}
+
+#innerDiv {
+  width: 400px;
+  height: 400px;
+}
+</style>
+
+<body style="margin:0" onload=runTest()>
+<div id="targetDiv">
+  <div id="innerDiv">
+  </div>
+</div>
+</body>
+
+<script>
+var target_div = document.getElementById('targetDiv');
+var overscrolled_x_delta = 0;
+var overscrolled_y_delta = 0;
+function onOverscroll(event) {
+  assert_false(event.cancelable);
+  // overscroll events are bubbled when the target node is document.
+  assert_true(event.bubbles);
+  overscrolled_x_delta = event.deltaX;
+  overscrolled_y_delta = event.deltaY;
+}
+document.addEventListener("overscroll", onOverscroll);
+
+function runTest() {
+  promise_test (async (t) => {
+    // Make sure that no overscroll event is sent to target_div.
+    target_div.addEventListener("overscroll",
+        t.unreached_func("target_div got unexpected overscroll event."));
+    await waitForCompositorCommit();
+
+    // Scroll up on target div and wait for the doc to get overscroll event.
+    await touchScrollInTarget(300, target_div, 'up');
+    await waitFor(() => { return overscrolled_y_delta < 0; },
+        'Document did not receive overscroll event after scroll up on target.');
+    assert_equals(target_div.scrollTop, 0);
+
+    // Scroll left on target div and wait for the doc to get overscroll event.
+    await touchScrollInTarget(300, target_div, 'left');
+    await waitFor(() => { return overscrolled_x_delta < 0; },
+        'Document did not receive overscroll event after scroll left on target.');
+    assert_equals(target_div.scrollLeft, 0);
+  }, 'Tests that the document gets overscroll event when no element scrolls ' +
+      'after touch scrolling.');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html
new file mode 100644
index 00000000000..750080e6568
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-element-with-overscroll-behavior.html
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+#overscrollXDiv {
+  width: 600px;
+  height: 600px;
+  overflow: scroll;
+  overscroll-behavior-x: contain;
+}
+#overscrollYDiv {
+  width: 500px;
+  height: 500px;
+  overflow: scroll;
+  overscroll-behavior-y: none;
+}
+#targetDiv {
+  width: 400px;
+  height: 400px;
+  overflow: scroll;
+}
+.content {
+  width:800px;
+  height:800px;
+}
+</style>
+
+<body style="margin:0" onload=runTest()>
+<div id="overscrollXDiv">
+  <div class=content>
+    <div id="overscrollYDiv">
+      <div class=content>
+        <div id="targetDiv">
+          <div class="content">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</body>
+
+<script>
+var target_div = document.getElementById('targetDiv');
+var overscrolled_x_delta = 0;
+var overscrolled_y_delta = 0;
+function onOverscrollX(event) {
+  assert_false(event.cancelable);
+  assert_false(event.bubbles);
+  overscrolled_x_delta = event.deltaX;
+}
+function onOverscrollY(event) {
+  assert_false(event.cancelable);
+  assert_false(event.bubbles);
+  overscrolled_y_delta = event.deltaY;
+}
+// Test that both "onoverscroll" and addEventListener("overscroll"... work.
+document.getElementById('overscrollXDiv').onoverscroll = onOverscrollX;
+document.getElementById('overscrollYDiv').
+    addEventListener("overscroll", onOverscrollY);
+
+function runTest() {
+  promise_test (async (t) => {
+    // Make sure that no overscroll event is sent to document or target_div.
+    document.addEventListener("overscroll",
+        t.unreached_func("Document got unexpected overscroll event."));
+    target_div.addEventListener("overscroll",
+        t.unreached_func("target_div got unexpected overscroll event."));
+    await waitForCompositorCommit();
+    // Scroll up on target div and wait for the element with overscroll-y to get
+    // overscroll event.
+    await touchScrollInTarget(300, target_div, 'up');
+    await waitFor(() => { return overscrolled_y_delta < 0; },
+        'Expected element did not receive overscroll event after scroll up on ' +
+        'target.');
+    assert_equals(target_div.scrollTop, 0);
+
+    // Scroll left on target div and wait for the element with overscroll-x to
+    // get overscroll event.
+    await touchScrollInTarget(300, target_div, 'left');
+    await waitFor(() => { return overscrolled_x_delta < 0; },
+        'Expected element did not receive overscroll event after scroll left ' +
+        'on target.');
+    assert_equals(target_div.scrollLeft, 0);
+  }, 'Tests that the last element in the cut scroll chain gets overscroll ' +
+     'event when no element scrolls by touch.');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html
new file mode 100644
index 00000000000..cfc782a809a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+#scrollableDiv {
+  width: 200px;
+  height: 200px;
+  overflow: scroll;
+}
+
+#innerDiv {
+  width: 400px;
+  height: 400px;
+}
+</style>
+
+<body style="margin:0" onload=runTest()>
+<div id="scrollableDiv">
+  <div id="innerDiv">
+  </div>
+</div>
+</body>
+
+<script>
+var scrolling_div = document.getElementById('scrollableDiv');
+var overscrolled_x_delta = 0;
+var overscrolled_y_delta = 0;
+function onOverscroll(event) {
+  assert_false(event.cancelable);
+  assert_false(event.bubbles);
+  overscrolled_x_delta = event.deltaX;
+  overscrolled_y_delta = event.deltaY;
+}
+scrolling_div.addEventListener("overscroll", onOverscroll);
+
+function runTest() {
+  promise_test (async (t) => {
+    // Make sure that no overscroll event is sent to document.
+    document.addEventListener("overscroll",
+        t.unreached_func("Document got unexpected overscroll event."));
+    await waitForCompositorCommit();
+
+    // Do a horizontal scroll and wait for overscroll event.
+    await touchScrollInTarget(300, scrolling_div , 'right');
+    await waitFor(() => { return overscrolled_x_delta > 0; },
+        'Scroller did not receive overscroll event after horizontal scroll.');
+    assert_equals(scrolling_div.scrollWidth - scrolling_div.scrollLeft,
+                scrolling_div.clientWidth);
+
+    overscrolled_x_delta = 0;
+    overscrolled_y_delta = 0;
+
+    // Do a vertical scroll and wait for overscroll event.
+    await touchScrollInTarget(300, scrolling_div, 'down');
+    await waitFor(() => { return overscrolled_y_delta > 0; },
+        'Scroller did not receive overscroll event after vertical scroll.');
+    assert_equals(scrolling_div.scrollHeight - scrolling_div.scrollTop,
+                scrolling_div.clientHeight);
+  }, 'Tests that the scrolled element gets overscroll event after fully scrolling by touch.');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-window.html b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-window.html
new file mode 100644
index 00000000000..ef5ae3daef8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/overscroll-event-fired-to-window.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+#targetDiv {
+  width: 200px;
+  height: 200px;
+  overflow: scroll;
+}
+
+#innerDiv {
+  width: 400px;
+  height: 400px;
+}
+</style>
+
+<body style="margin:0" onload=runTest()>
+<div id="targetDiv">
+  <div id="innerDiv">
+  </div>
+</div>
+</body>
+
+<script>
+var target_div = document.getElementById('targetDiv');
+var window_received_overscroll = false;
+
+function onOverscroll(event) {
+  assert_false(event.cancelable);
+  // overscroll events targetting document are bubbled to the window.
+  assert_true(event.bubbles);
+  window_received_overscroll = true;
+}
+window.addEventListener("overscroll", onOverscroll);
+
+function runTest() {
+  promise_test (async (t) => {
+    // Make sure that no overscroll event is sent to target_div.
+    target_div.addEventListener("overscroll",
+        t.unreached_func("target_div got unexpected overscroll event."));
+    // Scroll up on target div and wait for the window to get overscroll event.
+    await touchScrollInTarget(300, target_div, 'up');
+    await waitFor(() => { return window_received_overscroll; },
+        'Window did not receive overscroll event after scroll up on target.');
+  }, 'Tests that the window gets overscroll event when no element scrolls' +
+     'after touch scrolling.');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js b/tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js
new file mode 100644
index 00000000000..6fd1b32294b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scroll_support.js
@@ -0,0 +1,85 @@
+const MAX_FRAME = 700;
+const MAX_UNCHANGED_FRAMES = 20;
+
+// Returns a promise that resolves when the given condition is met or rejects
+// after MAX_FRAME animation frames.
+function waitFor(condition, error_message = 'Reaches the maximum frames.') {
+  return new Promise((resolve, reject) => {
+    function tick(frames) {
+      // We requestAnimationFrame either for MAX_FRAM frames or until condition
+      // is met.
+      if (frames >= MAX_FRAME)
+        reject(error_message);
+      else if (condition())
+        resolve();
+      else
+        requestAnimationFrame(tick.bind(this, frames + 1));
+    }
+    tick(0);
+  });
+}
+
+function waitForCompositorCommit() {
+  return new Promise((resolve) => {
+    // rAF twice.
+    window.requestAnimationFrame(() => {
+      window.requestAnimationFrame(resolve);
+    });
+  });
+}
+
+function waitForAnimationEnd(getValue) {
+  var last_changed_frame = 0;
+  var last_position = getValue();
+  return new Promise((resolve, reject) => {
+    function tick(frames) {
+    // We requestAnimationFrame either for MAX_FRAME or until
+    // MAX_UNCHANGED_FRAMES with no change have been observed.
+      if (frames >= MAX_FRAME || frames - last_changed_frame > MAX_UNCHANGED_FRAMES) {
+        resolve();
+      } else {
+        current_value = getValue();
+        if (last_position != current_value) {
+          last_changed_frame = frames;
+          last_position = current_value;
+        }
+        requestAnimationFrame(tick.bind(this, frames + 1));
+      }
+    }
+    tick(0);
+  })
+}
+
+function touchScrollInTarget(pixels_to_scroll, target, direction, pause_time_in_ms = 100) {
+  var x_delta = 0;
+  var y_delta = 0;
+  const num_movs = 5;
+  if (direction == "down") {
+    y_delta = -1 * pixels_to_scroll / num_movs;
+  } else if (direction == "up") {
+    y_delta = pixels_to_scroll / num_movs;
+  } else if (direction == "right") {
+    x_delta = -1 * pixels_to_scroll / num_movs;
+  } else if (direction == "left") {
+    x_delta = pixels_to_scroll / num_movs;;
+  } else {
+    throw("scroll direction '" + direction + "' is not expected, direction should be 'down', 'up', 'left' or 'right'");
+  }
+  return new test_driver.Actions()
+      .addPointer("pointer1", "touch")
+      .pointerMove(0, 0, {origin: target})
+      .pointerDown()
+      .pointerMove(x_delta, y_delta, {origin: target})
+      .pointerMove(2 * x_delta, 2 * y_delta, {origin: target})
+      .pointerMove(3 * x_delta, 3 * y_delta, {origin: target})
+      .pointerMove(4 * x_delta, 4 * y_delta, {origin: target})
+      .pointerMove(5 * x_delta, 5 * y_delta, {origin: target})
+      .pause(pause_time_in_ms)
+      .pointerUp()
+      .send();
+}
+
+// Trigger fling by doing pointerUp right after pointerMoves.
+function touchFlingInTarget(pixels_to_scroll, target, direction) {
+  touchScrollInTarget(pixels_to_scroll, target, direction, 0 /* pause_time */);
+}
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-after-snap.html b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-after-snap.html
new file mode 100644
index 00000000000..ef1b495791c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-after-snap.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+div {
+  position: absolute;
+}
+#scroller {
+  width: 500px;
+  height: 500px;
+  overflow: scroll;
+  scroll-snap-type: both mandatory;
+  border: solid black 5px;
+}
+#space {
+  width: 2000px;
+  height: 2000px;
+}
+.target {
+  width: 200px;
+  height: 200px;
+  scroll-snap-align: start;
+  background-color: blue;
+}
+</style>
+
+<body style="margin:0" onload=runTests()>
+  <div id="scroller">
+    <div id="space"></div>
+    <div class="target" style="left: 0px; top: 0px;"></div>
+    <div class="target" style="left: 80px; top: 80px;"></div>
+    <div class="target" style="left: 200px; top: 200px;"></div>
+  </div>
+</body>
+
+<script>
+var scroller = document.getElementById("scroller");
+var space = document.getElementById("space");
+const MAX_FRAME_COUNT = 700;
+const MAX_UNCHANGED_FRAME = 20;
+
+function scrollTop() {
+  return scroller.scrollTop;
+}
+
+var scroll_arrived_after_scroll_end = false;
+var scroll_end_arrived = false;
+scroller.addEventListener("scroll", () => {
+  if (scroll_end_arrived)
+    scroll_arrived_after_scroll_end = true;
+});
+scroller.addEventListener("scrollend", () => {
+  scroll_end_arrived = true;
+});
+
+function runTests() {
+  promise_test (async () => {
+    await waitForCompositorCommit();
+    await touchScrollInTarget(100, scroller, 'down');
+    // Wait for the scroll snap animation to finish.
+    await waitForAnimationEnd(scrollTop);
+    await waitFor(() => { return scroll_end_arrived; });
+    // Verify that scroll snap animation has finished before firing scrollend event.
+    assert_false(scroll_arrived_after_scroll_end);
+  }, "Tests that scrollend is fired after scroll snap animation completion.");
+
+  promise_test (async () => {
+    // Reset scroll state.
+    scroller.scrollTo(0, 0);
+    await waitForCompositorCommit();
+    scroll_end_arrived = false;
+    scroll_arrived_after_scroll_end = false;
+
+    await touchFlingInTarget(50, scroller, 'down');
+    // Wait for the scroll snap animation to finish.
+    await waitForAnimationEnd(scrollTop);
+    await waitFor(() => { return scroll_end_arrived; });
+    // Verify that scroll snap animation has finished before firing scrollend event.
+    assert_false(scroll_arrived_after_scroll_end);
+  }, "Tests that scrollend is fired after fling snap animation completion.");
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-document.html b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-document.html
new file mode 100644
index 00000000000..a35508e2c55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-document.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+#targetDiv {
+  width: 200px;
+  height: 200px;
+  overflow: scroll;
+}
+
+#innerDiv {
+  width: 400px;
+  height: 400px;
+}
+</style>
+
+<body style="margin:0" onload=runTest()>
+<div id="targetDiv">
+  <div id="innerDiv">
+  </div>
+</div>
+</body>
+
+<script>
+var target_div = document.getElementById('targetDiv');
+var horizontal_scrollend_arrived = false;
+var vertical_scrollend_arrived = false;
+function onHorizontalScrollEnd(event) {
+  assert_false(event.cancelable);
+  // scrollend events are bubbled when the target node is document.
+  assert_true(event.bubbles);
+  horizontal_scrollend_arrived = true;
+}
+function onVerticalScrollEnd(event) {
+  assert_false(event.cancelable);
+  // scrollend events are bubbled when the target node is document.
+  assert_true(event.bubbles);
+  vertical_scrollend_arrived = true;
+}
+document.addEventListener("scrollend", onHorizontalScrollEnd);
+document.addEventListener("scrollend", onVerticalScrollEnd);
+
+function runTest() {
+  promise_test (async (t) => {
+    // Make sure that no scrollend event is sent to target_div.
+    target_div.addEventListener("scrollend",
+        t.unreached_func("target_div got unexpected scrollend event."));
+    await waitForCompositorCommit();
+    // Scroll left on target div and wait for the doc to get scrollend event.
+    await touchScrollInTarget(300, target_div, 'left');
+    await waitFor(() => { return horizontal_scrollend_arrived; },
+        'Document did not receive scrollend event after scroll left on target.');
+    assert_equals(target_div.scrollLeft, 0);
+
+    // Scroll up on target div and wait for the doc to get scrollend event.
+    await touchScrollInTarget(300, target_div, 'up');
+    await waitFor(() => { return vertical_scrollend_arrived; },
+        'Document did not receive scrollend event after scroll up on target.');
+    assert_equals(target_div.scrollTop, 0);
+  }, 'Tests that the document gets scrollend event when no element scrolls by ' +
+     'touch.');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html
new file mode 100644
index 00000000000..0269c66fdde
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html
@@ -0,0 +1,93 @@
+<!DOCTYPE HTML>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+#overscrollXDiv {
+  width: 600px;
+  height: 600px;
+  overflow: scroll;
+  overscroll-behavior-x: contain;
+}
+#overscrollYDiv {
+  width: 500px;
+  height: 500px;
+  overflow: scroll;
+  overscroll-behavior-y: none;
+}
+#targetDiv {
+  width: 400px;
+  height: 400px;
+  overflow: scroll;
+}
+.content {
+  width:800px;
+  height:800px;
+}
+</style>
+
+<body style="margin:0" onload=runTest()>
+<div id="overscrollXDiv">
+  <div class=content>
+    <div id="overscrollYDiv">
+      <div class=content>
+        <div id="targetDiv">
+          <div class="content">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</body>
+
+<script>
+var target_div = document.getElementById('targetDiv');
+var horizontal_scrollend_arrived = false;
+var vertical_scrollend_arrived = false;
+function onHorizontalScrollEnd(event) {
+  assert_false(event.cancelable);
+  assert_false(event.bubbles);
+  horizontal_scrollend_arrived = true;
+}
+function onVerticalScrollEnd(event) {
+  assert_false(event.cancelable);
+  assert_false(event.bubbles);
+  vertical_scrollend_arrived = true;
+}
+// Test that both "onscrollend" and addEventListener("scrollend"... work.
+document.getElementById('overscrollXDiv').onscrollend = onHorizontalScrollEnd;
+document.getElementById('overscrollYDiv').
+    addEventListener("scrollend", onVerticalScrollEnd);
+
+function runTest() {
+  promise_test (async (t) => {
+    // Make sure that no scrollend event is sent to document or target_div.
+    document.addEventListener("scrollend",
+        t.unreached_func("Document got unexpected scrollend event."));
+    target_div.addEventListener("scrollend",
+        t.unreached_func("target_div got unexpected scrollend event."));
+    await waitForCompositorCommit();
+
+    // Scroll left on target div and wait for the element with overscroll-x to
+    // get scrollend event.
+    await touchScrollInTarget(300, target_div, 'left');
+    await waitFor(() => { return horizontal_scrollend_arrived; },
+        'Expected element did not receive scrollend event after scroll left ' +
+        'on target.');
+    assert_equals(target_div.scrollLeft, 0);
+
+    // Scroll up on target div and wait for the element with overscroll-y to get
+    // scrollend event.
+    await touchScrollInTarget(300, target_div, 'up');
+    await waitFor(() => { return vertical_scrollend_arrived; },
+        'Expected element did not receive scrollend event after scroll up on ' +
+        'target.');
+    assert_equals(target_div.scrollTop, 0);
+  }, 'Tests that the last element in the cut scroll chain gets scrollend ' +
+     'event when no element scrolls by touch.');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-scrolled-element.html b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-scrolled-element.html
new file mode 100644
index 00000000000..87cad79df7c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-scrolled-element.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+#scrollableDiv {
+  width: 200px;
+  height: 200px;
+  overflow: scroll;
+}
+
+#innerDiv {
+  width: 400px;
+  height: 400px;
+}
+</style>
+
+<body style="margin:0" onload=runTest()>
+<div id="scrollableDiv">
+  <div id="innerDiv">
+  </div>
+</div>
+</body>
+
+<script>
+var scrolling_div = document.getElementById('scrollableDiv');
+var horizontal_scrollend_arrived = false;
+var vertical_scrollend_arrived = false;
+function onHorizontalScrollEnd(event) {
+  assert_false(event.cancelable);
+  assert_false(event.bubbles);
+  horizontal_scrollend_arrived = true;
+}
+function onVerticalScrollEnd(event) {
+  assert_false(event.cancelable);
+  assert_false(event.bubbles);
+  vertical_scrollend_arrived = true;
+}
+scrolling_div.addEventListener("scrollend", onHorizontalScrollEnd);
+scrolling_div.addEventListener("scrollend", onVerticalScrollEnd);
+
+function runTest() {
+  promise_test (async (t) => {
+    // Make sure that no scrollend event is sent to document.
+    document.addEventListener("scrollend",
+        t.unreached_func("Document got unexpected scrollend event."));
+    await waitForCompositorCommit();
+
+    // Do a horizontal scroll and wait for scrollend event.
+    await touchScrollInTarget(300, scrolling_div, 'right');
+    await waitFor(() => { return horizontal_scrollend_arrived; },
+        'Scroller did not receive scrollend event after horizontal scroll.');
+    assert_equals(scrolling_div.scrollWidth - scrolling_div.scrollLeft,
+                scrolling_div.clientWidth);
+
+    // Do a vertical scroll and wait for scrollend event.
+    await touchScrollInTarget(300, scrolling_div, 'down');
+    await waitFor(() => { return vertical_scrollend_arrived; },
+        'Scroller did not receive scrollend event after vertical scroll.');
+    assert_equals(scrolling_div.scrollHeight - scrolling_div.scrollTop,
+                scrolling_div.clientHeight);
+  }, 'Tests that the scrolled element gets scrollend event at the end of touch scrolling.');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-window.html b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-window.html
new file mode 100644
index 00000000000..f9510e6e231
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/scrolling/scrollend-event-fired-to-window.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="scroll_support.js"></script>
+<style>
+#targetDiv {
+  width: 200px;
+  height: 200px;
+  overflow: scroll;
+}
+
+#innerDiv {
+  width: 400px;
+  height: 400px;
+}
+</style>
+
+<body style="margin:0" onload=runTest()>
+<div id="targetDiv">
+  <div id="innerDiv">
+  </div>
+</div>
+</body>
+
+<script>
+var target_div = document.getElementById('targetDiv');
+var scrollend_arrived = false;
+function onScrollEnd(event) {
+  assert_false(event.cancelable);
+  // scrollend events targetting document are bubbled to the window.
+  assert_true(event.bubbles);
+  scrollend_arrived = true;
+}
+window.addEventListener("scrollend", onScrollEnd);
+
+function runTest() {
+  promise_test (async (t) => {
+    // Make sure that no scrollend event is sent to target_div.
+    target_div.addEventListener("scrollend",
+        t.unreached_func("target_div got unexpected scrollend event."));
+    await waitForCompositorCommit();
+
+    // Scroll up on target div and wait for the doc to get scrollend event.
+    await touchScrollInTarget(300, target_div, 'up');
+    await waitFor(() => { return scrollend_arrived; },
+        'Window did not receive scrollend event after scroll up on target.');
+    assert_equals(target_div.scrollTop, 0);
+  }, 'Tests that the window gets scrollend event when no element scrolls ' +
+     'after touch scrolling.');
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/element-timing/observe-shadow-image.html b/tests/wpt/web-platform-tests/element-timing/observe-shadow-image.html
index 4309196cddc..12bda4724bd 100644
--- a/tests/wpt/web-platform-tests/element-timing/observe-shadow-image.html
+++ b/tests/wpt/web-platform-tests/element-timing/observe-shadow-image.html
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <meta charset=utf-8>
-<title>Element Timing: observe image in shadow tree</title>
+<title>Element Timing: do not observe image in shadow tree</title>
 <style>
 body {
   margin: 0;
@@ -19,13 +19,7 @@ body {
     }
     const observer = new PerformanceObserver(
       t.step_func_done(function(entryList) {
-        assert_equals(entryList.getEntries().length, 1);
-        const entry = entryList.getEntries()[0];
-        const pathname = window.location.origin + '/element-timing/resources/square100.png';
-        checkElement(entry, pathname, 'my_image', 'my_id', beforeRender, img);
-        // Assume viewport has size at least 100, so the element is fully visible.
-        checkRect(entry, [0, 100, 0, 100]);
-        checkNaturalSize(entry, 100, 100);
+        assert_unreached('Should not observe elements in shadow trees!');
       })
     );
     observer.observe({entryTypes: ['element']});
@@ -40,6 +34,10 @@ body {
       const shadowRoot = document.getElementById('target').attachShadow({mode: 'closed'});
       shadowRoot.appendChild(img);
       beforeRender = performance.now();
+      t.step_timeout(() => {
+        // Assume entry was not dispatched, so test passes.
+        t.done();
+      }, 500);
     };
-  }, 'Image in shadow tree with elementtiming attribute is observable.');
+  }, 'Image in shadow tree with elementtiming attribute is not observable.');
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html
index 8d6c452fd6a..62fd9ca389d 100644
--- a/tests/wpt/web-platform-tests/fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/corb/script-resource-with-nonsniffable-types.tentative.sub.html
@@ -56,9 +56,9 @@ protected_mime_types = [
   "application/x-gzip",
   "application/x-protobuf",
   "application/zip",
-  // TODO(lukasza): https://crbug.com/802836: Add application/pdf and text/csv
-  // to the list of content types tested here (after https://crbug.com/929300 is
-  // resolved).
+  // TODO(lukasza): https://crbug.com/944162: Add application/pdf and
+  // text/csv to the list of content types tested here (after
+  // kMimeHandlerViewInCrossProcessFrame gets enabled by default).
 ]
 protected_mime_types.forEach(function(type) {
     test(type, true /* is_blocking_expected */);
diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.rel-getter-01.html b/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.rel-getter-01.html
deleted file mode 100644
index 8e47121eb8c..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.rel-getter-01.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<title>HTMLAnchorElement.rel getter</title>
-<link rel="author" title="TheKK" href="mailto:thumbd03803@gmail.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-a-rel">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<div>
-<a id="test" href="a" rel="noreferrer"></a>
-</div>
-<script>
-test(function() {
-  var a = document.getElementById("test");
-
-  test(function() {
-    assert_equals(a.rel, "noreferrer");
-  }, "Test anchor's rel getter");
-});
-</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html b/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html
deleted file mode 100644
index c319266887b..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<title>HTMLAnchorElement.rel setter</title>
-<link rel="author" title="TheKK" href="mailto:thumbd03803@gmail.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-a-rel">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<div>
-<a id="test" href="a"></a>
-</div>
-<script>
-test(function() {
-  var a = document.getElementById("test");
-
-  test(function() {
-    a.rel = "noreferrer";
-    assert_equals(a.getAttribute("rel"), "noreferrer");
-  }, "Test anchor's rel setter");
-});
-</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-data-element/data.value-001.html b/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-data-element/data.value-001.html
deleted file mode 100644
index 9fc827b9b88..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-data-element/data.value-001.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>HTMLDataElement.value getting</title>
-        <link rel="author" title="ofekd" href="mailto:ofek@outlook.com">
-        <link rel="help" href="https://html.spec.whatwg.org/multipage/semantics.html#dom-data-value">
-        <script src=/resources/testharness.js></script>
-        <script src=/resources/testharnessreport.js></script>
-    </head>
-    <body>
-        <div id="log"></div>
-        <div id="container">
-            <data value=""></data>
-            <data value="40">Forty</data>
-        </div>
-        <script>
-            var newData, datasArr, container;
-
-            container = document.getElementById('container')
-
-            newData = document.createElement('data');
-            newData.textContent = 'Five';
-            newData.setAttribute('value', '5');
-            container.appendChild(newData);
-
-            datasArr = container.getElementsByTagName('data');
-
-            test(function () {
-                test(function() {
-                    assert_equals(datasArr[0].value, '');
-                }, 'data[value] #0 getter test');
-
-                test(function() {
-                    assert_equals(datasArr[1].value, '40');
-                }, 'data[value] #1 getter test');
-
-                test(function() {
-                    assert_equals(datasArr[2].value, '5');
-                }, 'data[value] #2 getter test');
-            }, 'Getter tests');
-
-            test(function () {
-                var i;
-
-                for (i = 0; i < datasArr.length; i++) {
-                    datasArr[i].textContent = 'Twenty';
-                    datasArr[i].value = 20;
-
-                    test(function() {
-                        assert_equals(datasArr[i].getAttribute('value'), '20');
-                    }, 'data[value] #' + i + ' setter test');
-                }
-
-                newData = document.createElement('data');
-                newData.textContent = 'Twenty';
-                newData.value = '20';
-                container.appendChild(newData);
-
-                test(function() {
-                    assert_equals(datasArr[3].getAttribute('value'), '20');
-                }, 'data[value] #3 setter test');
-
-            }, 'Setter tests');
-        </script>
-    </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/native-file-system/NativeFileSystemWritableFileStream.tentative.window.js b/tests/wpt/web-platform-tests/native-file-system/NativeFileSystemWritableFileStream.tentative.window.js
new file mode 100644
index 00000000000..1dbcb2b1362
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/NativeFileSystemWritableFileStream.tentative.window.js
@@ -0,0 +1,126 @@
+// META: script=resources/test-helpers.js
+promise_test(async t => cleanupSandboxedFileSystem(),
+             'Cleanup to setup test environment');
+
+promise_test(async t => {
+  const handle = await createEmptyFile(t, 'empty_blob');
+  const stream = await handle.createWritable();
+
+  await stream.write(0, new Blob([]));
+
+  assert_equals(await getFileContents(handle), '');
+  assert_equals(await getFileSize(handle), 0);
+}, 'write() with an empty blob to an empty file');
+
+promise_test(async t => {
+  const handle = await createEmptyFile(t, 'valid_blob');
+  const stream = await handle.createWritable();
+
+  await stream.write(0, new Blob(['1234567890']));
+
+  assert_equals(await getFileContents(handle), '1234567890');
+  assert_equals(await getFileSize(handle), 10);
+}, 'write() a blob to an empty file');
+
+promise_test(async t => {
+    const handle = await createEmptyFile(t, 'blob_with_offset');
+    const stream = await handle.createWritable();
+
+    await stream.write(0, new Blob(['1234567890']));
+    await stream.write(4, new Blob(['abc']));
+
+    assert_equals(await getFileContents(handle), '1234abc890');
+    assert_equals(await getFileSize(handle), 10);
+}, 'write() called with a blob and a valid offset');
+
+promise_test(async t => {
+    const handle = await createEmptyFile(t, 'bad_offset');
+    const stream = await handle.createWritable();
+
+    await promise_rejects(t, 'InvalidStateError', stream.write(4, new Blob(['abc'])));
+
+    assert_equals(await getFileContents(handle), '');
+    assert_equals(await getFileSize(handle), 0);
+}, 'write() called with an invalid offset');
+
+promise_test(async t => {
+  const handle = await createEmptyFile(t, 'empty_string');
+  const stream = await handle.createWritable();
+
+  await stream.write(0, '');
+  assert_equals(await getFileContents(handle), '');
+  assert_equals(await getFileSize(handle), 0);
+}, 'write() with an empty string to an empty file');
+
+promise_test(async t => {
+  const handle = await createEmptyFile(t, 'valid_utf8_string');
+  const stream = await handle.createWritable();
+
+  await stream.write(0, 'foo🤘');
+  assert_equals(await getFileContents(handle), 'foo🤘');
+  assert_equals(await getFileSize(handle), 7);
+}, 'write() with a valid utf-8 string');
+
+promise_test(async t => {
+  const handle = await createEmptyFile(t, 'string_with_unix_line_ending');
+  const stream = await handle.createWritable();
+
+  await stream.write(0, 'foo\n');
+  assert_equals(await getFileContents(handle), 'foo\n');
+  assert_equals(await getFileSize(handle), 4);
+}, 'write() with a string with unix line ending preserved');
+
+promise_test(async t => {
+  const handle = await createEmptyFile(t, 'string_with_windows_line_ending');
+  const stream = await handle.createWritable();
+
+  await stream.write(0, 'foo\r\n');
+  assert_equals(await getFileContents(handle), 'foo\r\n');
+  assert_equals(await getFileSize(handle), 5);
+}, 'write() with a string with windows line ending preserved');
+
+promise_test(async t => {
+  const handle = await createEmptyFile(t, 'empty_array_buffer');
+  const stream = await handle.createWritable();
+
+  let buf = new ArrayBuffer(0);
+  await stream.write(0, buf);
+  assert_equals(await getFileContents(handle), '');
+  assert_equals(await getFileSize(handle), 0);
+}, 'write() with an empty array buffer to an empty file');
+
+promise_test(async t => {
+  const handle = await createEmptyFile(t, 'valid_string_typed_byte_array');
+  const stream = await handle.createWritable();
+
+  let buf = new ArrayBuffer(3);
+  let intView = new Uint8Array(buf);
+  intView[0] = 0x66;
+  intView[1] = 0x6f;
+  intView[2] = 0x6f;
+  await stream.write(0, buf);
+  assert_equals(await getFileContents(handle), 'foo');
+  assert_equals(await getFileSize(handle), 3);
+}, 'write() with a valid typed array buffer');
+
+promise_test(async t => {
+    const handle = await createEmptyFile(t, 'trunc_shrink');
+    const stream = await handle.createWritable();
+
+    await stream.write(0, new Blob(['1234567890']));
+    await stream.truncate(5);
+
+    assert_equals(await getFileContents(handle), '12345');
+    assert_equals(await getFileSize(handle), 5);
+}, 'truncate() to shrink a file');
+
+promise_test(async t => {
+    const handle = await createEmptyFile(t, 'trunc_grow');
+    const stream = await handle.createWritable();
+
+    await stream.write(0, new Blob(['abc']));
+    await stream.truncate(5);
+
+    assert_equals(await getFileContents(handle), 'abc\0\0');
+    assert_equals(await getFileSize(handle), 5);
+}, 'truncate() to grow a file');
diff --git a/tests/wpt/web-platform-tests/referrer-policy/README.md b/tests/wpt/web-platform-tests/referrer-policy/README.md
index ea158fe5394..303362df924 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/README.md
+++ b/tests/wpt/web-platform-tests/referrer-policy/README.md
@@ -96,7 +96,7 @@ The ```./generic/tools/clean.py``` utility will only work if there is a valid ``
 
 ## Updating the tests
 
-The main test logic lives in ```./generic/referrer-policy-test-case.js``` with helper functions defined in ```./common/security-features/resources/common.js``` so you should probably start there.
+The main test logic lives in ```./generic/referrer-policy-test-case.sub.js``` with helper functions defined in ```./common/security-features/resources/common.js``` so you should probably start there.
 
 For updating the test suite you will most likely do **a subset** of the following:
 
@@ -105,7 +105,7 @@ For updating the test suite you will most likely do **a subset** of the followin
 
 * Add a sanity check test for a sub-resource to ```./generic/subresource-test/```.
 
-* Implement new or update existing assertions in ```./generic/referrer-policy-test-case.js```.
+* Implement new or update existing assertions in ```./generic/referrer-policy-test-case.sub.js```.
 
 * Exclude or add some tests by updating ```spec.src.json``` test expansions.
 
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
index 3ced0f49983..0d26645aa70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
index df835c45e10..5e0ac6b270a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
index 1a0d9ebdda2..88474aae738 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
index db655fbb726..164f8a5d1e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
index cc99b1f3ddc..c7908939ccb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
index 969db95179e..74a3cbde0ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
index 40eb09357b9..078536ee386 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
index 25b0ed13473..bae74857f3f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
index 370bc44b6c1..5f5069b7158 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
index eb1b019c988..a3b061d79ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
index d6ff26e7bcc..a0e9daabbc6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
index e96b25a9712..80f7ec41b59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
index 29a8517e117..f0b46995f60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
index 95d3b11a42a..6f2dc3aa4e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
index e52d9b65097..97f23405c26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
index 54ee36ce30b..c02e5598f74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="never">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
index 59fb4025f3b..5e8552ce8c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
index 82d75665ea1..c061f3ab13d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
@@ -7,7 +7,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
index 8e616416380..859e405e223 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
@@ -8,7 +8,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
index 99ec1ae6aeb..93b6037ca63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
@@ -8,7 +8,7 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html b/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
index ca17e03933a..28e83df6c2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/iframe-inheritance.html
@@ -8,7 +8,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body onload="runTest()">
@@ -26,7 +26,7 @@
         document.body.appendChild(iframe);
         iframe.contentDocument.write(`
             <script src = "/common/security-features/resources/common.js"></` + `script>
-            <script src = "/referrer-policy/generic/referrer-policy-test-case.js"></` + `script>
+            <script src = "/referrer-policy/generic/referrer-policy-test-case.sub.js"></` + `script>
             <script>
               var urlPath = "/common/security-features/subresource/xhr.py";
               var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
index b7a9c9fe0e4..d4826ce8a7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy header and header values are allowed</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
index c13403aa22a..47b59f55661 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy header values are allowed</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
index c36c456e23a..9bd661fe6a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
index 6a8c8eecbff..7c28a5ada52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
index 5b9c4eb20a4..7f0364f1853 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
@@ -6,7 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers are allowed</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.js b/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js
similarity index 99%
rename from tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.js
rename to tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js
index c8a3beaf89e..b2867609e7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js
@@ -1,6 +1,6 @@
 // TODO: This function is currently placed and duplicated at:
 // - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.js
+// - referrer-policy/generic/referrer-policy-test-case.sub.js
 // but should be moved to /common/security-features/resources/common.js.
 function getSubresourceOrigin(originType) {
   const httpProtocol = "http";
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
index da3455cb2a8..0e8e5e1306f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
@@ -8,7 +8,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: A document with an opaque origin doesn't send referrers</h1>
@@ -27,7 +27,7 @@
           iframe.srcdoc = `
               <meta name = "referrer" content = "always">
               <script src = "/common/security-features/resources/common.js"></` + `script>
-              <script src = "/referrer-policy/generic/referrer-policy-test-case.js"></` + `script>
+              <script src = "/referrer-policy/generic/referrer-policy-test-case.sub.js"></` + `script>
               <script>
                 var urlPath = "/common/security-features/subresource/xhr.py";
                 var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
index 936e2ef0f50..ad49c0c2efd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Area Link messaging - cross-origin Area Link navigation</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
index cc17b3d8de9..2d835274c13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Fetch messaging - same-origin Fetch request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
index 45c5abc8644..2f97ce4c62a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Iframe messaging - cross-origin iframe request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
index a3c8626641c..97abb153f1f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Image decoding - cross-origin image request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
index 966547c3580..e96fd225398 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Link messaging - cross-origin Link navigation</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
index 0a93266e2c5..44c938fa6e1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Script messaging - cross-origin Script request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
index c85cfca5c39..0612e996598 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Worker messaging - same-origin Worker request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
index dd48dec8e6b..8afbf1db237 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>XHR messaging - cross-origin XHR request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py b/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py
index a59770ffa26..b3e3340d97b 100755
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/tools/generate.py
@@ -25,7 +25,7 @@ the target request is %(origin)s.'''
 
     self.test_page_title_template = 'Referrer-Policy: %s'
 
-    self.helper_js = '/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub'
+    self.helper_js = '/referrer-policy/generic/referrer-policy-test-case.sub.js'
 
     # For debug target only.
     self.sanity_checker_js = '/referrer-policy/generic/sanity-checker.js'
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html b/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
index 190aa5212f3..0a29f38c028 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
@@ -7,7 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: CSP 'referrer' directive should not be supported</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 42be3b8892e..ea712646bb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index bf4894dea18..cfc379c0534 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index cbbccd6cd4c..0d592b59d40 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 0e201a2d8eb..8d108c74608 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 346326f9245..8a3731927e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 91119cc9eef..463728a4ecd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 25d9de531ae..d5275be0409 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 9cd52ad2acd..21ea496ca49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 51c7beb7690..c54ac62bfe9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 06434ccb743..cdcc134dedf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 9d80f4b1e72..43435ff17b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index fc18b7eb3cb..61b962276bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index f5e284dbdf2..0ac4282fb41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 33f88211bd7..ad75a53979d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index ef4c62e3562..0cfaedb10bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index f3eed251927..3ef49b93f0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 15be1dbc74b..a060a3bcfe2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index ee133164489..deb4132ab08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 2e1190bda4a..793166af730 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index c77c6e692b1..1737e72548c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 29b2e708b94..57fb4a946c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index f7c4e35e2aa..c64034d2bbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 7f3a6b86945..387f84c09ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 4ca9775d6bb..4d0c946bd7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index f19ff96c945..9c769ba10d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 23fe26c9ab5..2b1ee01973e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index db8daa3957f..42665670f5b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 5093a462d0f..fa0accb2c06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 493fad2ae30..59d852294b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 02dd4ec339c..e1b79bca805 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 299fc9f6267..f0d321a52cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index ad2f7e9f51d..ceeaba32d59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index f034708abaf..59322a856e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 4c8f33a6334..ea8dcab7c7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 41219e4b5f1..5aa80479004 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 6c1bca655a3..df88f442fab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 3f15616a04e..8ffbd3a852c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index e0bc023c1f5..455efc4ae70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index b841182703f..89da6893a20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index dafb2477b9f..6b29a191efe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index a029a7eae14..eedf34f796d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 06966301d0a..8b77fb75247 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 26a74ef2fdd..3e921ee2051 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 461a108d180..c7821aae3f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index caa18cc0690..bae8956bf7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 5d9ba45af0e..c418c5a2714 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index a8305f77a29..d8c7a5467c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 387257aed31..437a2c703c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 163d9e7d4ca..5887e73ae7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index aaed1cd1248..e320e6191b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index eff18098e71..fc100af0081 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 79c395728ff..c9810465b2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 7ff6788142d..71c95f870ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index ad55af9e009..9fe5ef8a619 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index cb5f93ece0a..0901c1bc1f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 118262cccd2..3f3bcb557ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index df071559f7b..7a78d49b641 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index a741bbce667..51adeac1f15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 66b527001be..97c8b34e5fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index c22ac9819c5..67241ce4616 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index aff550f0dcf..f60094da322 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index be319727156..183e4dd4367 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index dc1758ab702..5a3b4486d82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index eccaeafc502..6144b6e19ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 5d608aa5fce..4fe4fe8bc0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 4c59595e060..0ed931f885d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 147088b7b2a..9be57e4a592 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index f655ea4eac6..2df7c747290 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 21d84a1deb1..75d4b9fbe19 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 15b99758704..2a9392df1d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index c5377a40030..028ee939474 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index ce61e3e124f..66e42d84e1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index ab594bdde60..0fc1d169c9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index c515745a002..7e988ffbc8e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 85f9acb33fb..335fde0034b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 56db3510a7a..3ab4e9b33a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 1e942bc9649..c8946d88a00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index d8b7367afd3..e79e8a05742 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 970122cf57c..cc5ea2700e1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 1d9ae9943a9..759625f622c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index d7dd197d6a2..34c39041f99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index d3d58cdd055..9301f0b2719 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 2a2832c603c..7b9a33f47e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index d749b1fb534..3303e355a48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 6ea648d497d..932ac4e18f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 6452e189535..32dac4bf4fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 2eea5bce5c2..88a6f0b3283 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index eb402eb930a..0caca74b53d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index d8f2cc325f1..f6215762acb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 770aa2196c9..35123332a8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index cbd81ef8c9b..757b06bc6ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 04a71c73283..3044b007cd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 666f273d48e..2f61fa770d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 9e0a6320302..fbbb9efd933 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 5573699066a..93479418ab5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 5cfb653e611..8a6ba540eea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 4467c6fc86e..de595abdeda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 20c6e672845..07a1ddc3a02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 61c183df1e9..47c96588dbf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 94a55f631d5..e047b17d411 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 6572626f169..404e18bd654 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 052c4f3071c..246db457035 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 7a639efc055..0a2a0f026c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 35ea0233668..b35d8f7f4f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index ae707095f09..aee79e7279e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 5efe260b42e..e1ae930f78b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 46d4d6f770f..5e871b80659 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 5c177baeeee..c606d407a3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 48ba4fbec2a..bb9ccab8126 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index afe482af237..4544ade5134 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 0c013c4f0db..14d891c6ca0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index ce637b53eb7..7205b5b5e20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index d48760a422c..2bd7f7f9f96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 06a9d7d4a72..6c941b98aff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index a608e3ae09e..78a12c0faf7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index d6e741e3f62..8cb3b1da63c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index c39a1430b20..98b574b0334 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 3b97f957b2f..f6755e99add 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index b67f4397f7a..9ee1de48295 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 19fdfe685f3..1f0b254a2a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index f6e26655cc5..85b47db7c49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 6e2a592ff5d..e2b6315eed7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index cd5c2c08b4c..8cd18a658d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index dd579ccc99c..db8b65c9070 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index b5a81887911..b37fab1c7d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 27d3900a4a8..a8967e2f007 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 912f9992422..0f512823e8e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 42b78741757..1a7931b1016 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 421d4d9e09f..7c80c012b34 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 397ad2d6833..221dfb63ef9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 3f04ea7736c..6373a785fc2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 77605609762..20f91bbeb1d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 59a8041e699..c20b8e0eff6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 08e3f97c09e..44b8145030a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index e3ca9c6ab65..dde31a65bfc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 84654cab5dc..98d1e981204 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index c56716ebd31..e6f1a3e27c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 22ebf6e76b8..4737eb59404 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 5eaa959e054..41018d5e2c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 132eb3cdd93..adc9f952d66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 5a0aa248a97..2210516aeca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 02c61798094..43fab7d5701 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 9156260a10f..6a5f3c4fcc5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 9f232627d47..1f280d02fb4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index ddcc0e02cd8..603daa98f17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 154aca212a0..6ce64e62d24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index b171edf427e..93075883216 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 45ccc753e08..ef700be7505 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index f2940a424d1..070e6a8817d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index c4fe80639d4..7784873f7f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index c6915f8341a..917c0b88847 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index e5d0b8f3d10..a00848a63ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 6a6d1d46e28..f75b72157f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 8694c941d27..f6367edbb22 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 19fabf6fc37..c603a42b7c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index e3909a54f80..6d303558e7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 754bb727a07..4436fc516bc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 11df0d69acc..20047defd66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index cb2882b62f7..966abff838d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index bc28f2bf84f..c6ee143fc88 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 233ffad4859..7e239d69aff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index ee95a6ca6fb..31c3b79a581 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 3a0a025e72d..6eed03783b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index decdcef4b9d..61a5e51e637 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index bf1e8ec167b..ebb93af5050 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 2aed2d235a6..7699f0f96b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 80ce3783597..12f4286f8d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 66b6c28112d..e44a4fc096e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1b67ec6aca1..6a338aa72ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 035a8f30206..5c81707fb55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 912a9a13dbd..90c65ae6e87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 4a329a1f3de..f4bdee5ce86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 8de2e24297a..5e12002f256 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index c6c75eaebd6..134f342965e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index ee046e2aa40..ee71a0d6f04 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index b65e1a448a4..efe2c0d2f95 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index c216046a1e0..83ca9017551 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index c7844b8d79a..c902ffc410f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 94749a5e4e5..7bfc7656576 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 3bfc3c54616..c85180f01e1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 15d6d703128..d0ab6e1ccbe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index ace01a8c14f..8f5b1a70b21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 87a3d2c6b18..086c8b1a047 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 07bbfd3ca36..d0e05376f09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index f881b1fa904..74ed8a8903d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 019d330457e..41a4c940c12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 57670bc8697..37879ce158d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index e4efa6eeff3..7bab6eff28e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index a3b162e0b1f..b874f1970b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 81fe68ccce9..ce4957f92f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 59aa6a99b70..08dd0a18a46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 429fbeb81fc..d940fe023d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 3c06d739857..ae67228e393 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index d17bf1c93c5..edb49e27f23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index bee60557c65..f48a0217588 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 4d4e09bbca4..795774b4006 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 7d78a9e44e9..8d4143e4ab9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 2ab167d0ce2..68547fdbb73 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 62a67844560..acf4458a168 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 1bf40e66f2f..6f57c7c4b2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 549851abf84..e2404361ecd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index c57951a0a2b..66660f05264 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index e7a22774a22..15e97825424 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 12b8220736b..f5e38ddb803 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 47e76c0a1e2..20dfb8a3d66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 67e3d38c17e..661a0cb964c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 184a637ed68..4705a198887 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index e7b04e82ed7..66310f711b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 42977a1babd..79be70d7587 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 846b585792e..d3a7d9627f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index be8d5997fff..4140287d379 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 629f4649ccd..0816608f10f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index ff78c96c8d4..4af019d39fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index a2d94af9139..fde81606e41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 984eb926b7a..930a9c1450c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 5cfcd569d69..8d08d63d728 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index b8fb99174fe..dbbc89ead38 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 9f0f9884e5c..a190ee17938 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 44044767d1d..3a1d16bec4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 67fa569157b..572d84007c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 0ac870c47c5..c1a8a0a0bc2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index af7827fed49..c5726ef3701 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 0bead7943fe..a851d5bd818 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 27018f7b550..54e6d020281 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 995e8e10a88..8250944c36f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 6fec6ccca28..df0fe535c15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index b2728cfa0c1..e56f9107aae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 23b325b573d..a47e2e0c615 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index b24d53bd2a1..3dd2c1247dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index ffb70e5b701..256db1aa584 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index a0ef0088a26..7c05f53f14f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 6022c1a8927..83a91abf2bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index affaa0c387a..461fce61eef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 4232b25a0f6..9d5a65e3171 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index c0addfbad60..26912186351 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 2595ff89e78..d67f6bdbfba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index f5805796344..e1a27e3fbae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 7faa8adac37..bfd73c92dc6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index d0ee98496e3..4b61d4478a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 3ad094a328e..eb4e0b3414d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 50f2649d3f7..7ebd1199cc1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 07abb8e5cbf..45675268814 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 964449d2663..fecf19ce75a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 94bcc64d46e..8a07db8736e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 34079bf8986..ab0b3501c39 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 0ca38518196..3493ca250b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 366db4e4be7..fe714d038bc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index f24392c0915..82002683fc9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 7142ad4f6ea..f84861f792a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 0fe52855874..8482c8ae977 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 733db4a841e..48168636f42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 81b4f4d86fc..aa3455bc2df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 155d48f43a2..121bfdfa468 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 560c9a1227d..ed2159b6473 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index a677f73429b..4495c5440cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 97e792bcfb9..eb067ac7967 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index ae8cdc91efb..72b43aa9936 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index df52f3058d5..d2cf0366dca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 4c3c0706090..34d467754d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 7a9ec93295c..637b156a282 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 71bc6bf37af..ad34824d58d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index a37cc7545f4..f89a079a552 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 420d190d6c7..40e0fd0a810 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index e5509fa0184..a8d3c3ed2b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index c7b2fdf2e35..df047a0ff44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index d3c9121b537..6454292d6f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index c4bffccd640..9a9c91976d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index e6f13a4cb31..fedae8b7f7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index dd3faa6b87c..31892705e0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 1ad2fbdd20f..c3981366c5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 295fe6e58d4..daf2637065f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index bacdc0b2183..eb5e616ecd6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 54ae74c6b30..abbf8fcb914 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 9826add65df..b5f28d2d671 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 305ba094ce9..3780ae41833 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 0c85bf84eb6..e40426f78a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 1f6c3bc7ebf..a4bd83ad284 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index af59665cf4e..6696fba26b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index fee454c3d55..fbb4fa45f7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index b4b8a21a9d2..35af16f4dca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 1c3f86a913a..0c1af722041 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 7c93de3d5e8..d2bc6fd4842 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 4b89570dbaf..7cdfc9bd414 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index fc779aa8652..6a1d773f91b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 3fe0152390f..47c4a60aed7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index edcf827aa2d..9e95ed2ef1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 34660256411..2a897d97add 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 469d8f70b05..507432c9db1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index e71021bade6..1a6cf6884b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 840a1f7a074..2b7beb3a4bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 374902ef366..ba1fd4a4110 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index e2c2cd4dd56..43df09f493c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 9f17129a4b5..346c0165cf2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 5e5bd63da04..9c19546b28b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index f94b5d59213..dc74b170064 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index ca07e207067..0726049eefc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index df2429b6a25..93b5b91c161 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index f103376eb3d..a09e04cd22c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 2af6647bfc7..9981baec4ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 90148accbdf..c2a92aa157e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 4c6847caf27..6b094f9b36e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 1f21cefa068..fa473268c6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index b56e5b8524b..2f8afbe8aed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 6b9544a0dde..65cafa2b4f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 6202549dcc2..21a26882771 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index d031329a3f1..ce35564bf9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 6e46166057e..80165257482 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 95e8de45caa..47aaeb0646d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index f742f21d8f0..1e3252924fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 0cfc6ecefb6..e09bacfa6fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index be708f879ea..ec641955cab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 645c7f0bb98..298ed876f0a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index e46169ce4bc..c80d5bfd080 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index a419537cd50..33451710956 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index c9b86740595..c444cb95402 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index f68e12df619..8d06c867b75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 7f8c3fba5d2..6b4d7aaf3d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index fe517279177..02f1cec108a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index e4e1599e76c..3ab475dd62f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index bdc96d0383f..180cf23b63f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 58cdf01e3ad..fb63204561f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index cd10a5c9fe8..856c6e24e13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index dce6ced3f82..96ac4f9de15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 16df4a1a945..1fdff5963da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index 0f99427b672..05c28a5475d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index e53f5b42068..c60ecc104a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 08978a33c3f..8d81edd0440 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 316011bef19..a5a728cf86b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 410956b9fe4..df4f87235d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 0318305cd2d..ec0a21e2db1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index a5a1cc939db..6255a8d29cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 751da7c02a5..b878f3839f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 56fa33cde33..2ce35a6ee3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index eebb7a97223..bde8e0f0d13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index ed3608e5d24..6b5ea62e345 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 483edb33208..b39c40d1698 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index ddb4d1a41e3..ba4fe78409f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index c30a50e1895..9b6574020c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 90ea1080614..544426d28c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index ce4d4606e11..833d0f69136 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 7c92e52d2bd..55709bb0db2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 7ad39cfa2aa..a4919c0f7dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index f62c5d870ae..9da55918ae3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 517734843cc..9884fb1f072 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 6d14ffa0768..01179a3fab9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index ca7c37392e7..5a27c133476 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index e5c3b9b584e..915801c177d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index a80f646780e..504092c875f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 3a08e3fdebe..f128c96d648 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 99cdbf23fc6..9ffd13b1c9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index e6b82d9a47d..c3bc40e34b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 518d9246bd0..5072cbcf152 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 160591e9286..6941a3a73a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index b7e66752c39..cf296add12b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 636b3dc8380..6219c76898f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 679cfe519de..3a2ea609daa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index dd4fed69476..c9bd5781db9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 41268757bc8..28239d6b595 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index c18b2c4445d..cabb0193e6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 6e6c3fa217e..22147bafb08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 23954df4320..630393ca7b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 3669e9b1566..660496841a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 80e254d9365..3f0455561a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 17b30ec2ccf..58a3e67dfb7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index ff598293c77..fe7d67eac06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 2ed99daf6f9..94d9aa008c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 823b59775c9..5b7d1de44cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index 511d41f9447..8b6ac65947c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index e63fa654aa4..2f6692c4293 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index ec1bb58ad05..93e56189dfb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 2c39f3fd93a..baf2fe78440 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 189a82c85aa..0736088aa84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index f87ad3a5d32..e6de3ee6078 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 34438f354b2..eb27059a957 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index eba9addd891..eb1c0191a3b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 173c6495577..9d006903a0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index bfe6a69006f..911649a5d14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index df7a1dd4463..27cb0340e0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index bed99339a37..08c297eae3b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index ffb89bdf1cc..3b72cc842c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index 3c22697590f..89532a53691 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index dc8ac21f0ab..959d00137c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 4166504179a..7ba2e047912 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 01293507748..8b215bc8f4c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index f9aff9a3e9f..4c4ea0c52d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index ae3c99d79a5..3ae29a17caa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index c4bbb04f499..e47bca42c76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 05d016aa8e1..c6421476aef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 06874952d0b..77c266d21e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 633bca5dd9b..511058ccf50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index 1a6e774a450..ffc0a2ee559 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 51f4051dffc..8ede638ebbf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index 04fb16a1be3..288fa038a4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 320062ffd09..f8e8509b8c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 3de3c060a97..88ab886b233 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index 910791a8f7e..f2482c3b3ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 64295c74134..24ab142cfd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 5d96c06a329..91d8a23ea5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index 4452586c190..d486a7b8569 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 35673291ad7..bac54212f09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index a1e54114712..fe1ec67414d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index 08962578590..3d02acfc5f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index cffde877e10..4fc0a20ca2a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 96e1557063d..46ca3525e66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index b10f9c0f5c4..6367857969a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 44f635102c1..dc266208a24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index c15d5403d18..ae9a1a24c96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 1f56ff4ec9c..3b0e4d177d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 98121e02780..fd2db5728fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 5c8725b21ac..b900db726c2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index cc796d1d10f..62acabf41c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 6fdf28dab6a..ba056619102 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 95ca50ec9d5..d86a85b208d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index d1e4ec5e5a5..a5940fd6d94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index 9ae77fc8525..e53a0ed387a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index 5afe2786920..ebba94e987d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 80ac216ce53..d36ac614868 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index f978eee6e13..8ddd1581839 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 48021931887..3740814c441 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index d1a6470f4f5..461c255ec90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index dc816247653..f8cecd0d791 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 2d9914b0cc0..e1b46f72b9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index fbffbb36315..010656cfb05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 7d5176b31d3..0feafdce56e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 3535e470e3b..a72089286fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index c005cdb21ad..db330329909 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 92d5ad04dfc..47e98f19d00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 80c2dc96234..ddf8b522b59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index 43956fb2773..17f72f72702 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index b78a54bdec2..4dbd0d1e8c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index 5f75d954708..01b339b41d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index 972f53c499d..07a972315fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index 2ed48c76b59..f4db0be0e50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index fc7ce513774..befe72d9695 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 73c74711d74..b2eca76078f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 2c20f0678cd..50768c30cf4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 36dea90ccd9..8fae2caef61 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 6aaf6bcc355..4a41087b095 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index b0a83b027e5..b6a898c1ad2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index c4b5d2dc307..a26f0dd202e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index cbde3dc348e..8b178d9990c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 17a49b5e9a0..0a46c97106b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index d8d63426e63..cc92566b86d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index 021cde83cf5..99927886521 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 55d1153b4eb..a7d6c72f08c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index cef8c446d0d..c4df370a717 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 0b5e66191bf..8c45a5dac20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 085e7f94dc6..bd13da2a292 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index 93e882f38f8..3c53fa01167 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index d8f37e50d29..ec3e284c3c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 942d1e58614..e6854db2f3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index 3e897a0df32..526c2648432 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index 309a08d9c1d..bbf21e785f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 3c551d85fc8..9cef48221ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index c260249ec34..e9125ad0682 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
index 60237386565..4b59071d48b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
index 9e261a6bd39..0a8ce7cfe01 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 3e787e57045..09f21bf5294 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index e9e7be04b64..53229010cfd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index 4e950e8fec5..6a53bb812b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 3141c630194..dd27004c1c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 88c7a890ba4..131c0e0893a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index e12c0aaac75..61753d6188a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 2e21ae4dd55..e3cd0610003 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 35d0b6ddcb4..6c8a0fd643d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index d5b58f05de2..5c6d59f53ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index c98d80d76e4..4ccf6b24c82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
index 0df0cb032c3..07887aa6a61 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
index a77d5f4093e..a226cfc9422 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index a85b2278ada..9d2cb261d6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index c744a58972b..7d128a216ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index 212ab9cbf2e..f95a61709ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index f222c73ba35..e5c4a5b9d70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 48e45cf0bd3..6b69d4f3399 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index aecad6912fe..b36d8e43696 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index f32b57b4618..cb22d1880e1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 1511e2698b0..10c4f953428 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 16663cef199..f93f8399ef7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 03a416fef88..ef7dfd49fe4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 93359f78a7b..6335b58a250 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index 9c13229902e..9087f457aa7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 91d2de7e66d..cfbb2478acd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 75db963a5e1..562bc513b1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index fc37bed2d67..2aa2cdd9b4c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index aee2ea7c9d0..92b2a2069cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index e7e8c62d18f..9703cae9306 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index c08627c88bf..bfae1b4ce35 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index 61fe98cc34f..8f5342fc17a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 5a3ac9cad35..c4f1a54f2c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index 751fe6f733f..1b961e3dfb4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 2aeead25c70..137aa7e3af8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index b58bb94275e..1703a958e78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 5b615aa638d..c3c98c4d440 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index f258c7d56b5..3d8e32017d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 2847f7f7bd0..9fa4ca3c127 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 89e14deaf8d..feec6a71fff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 58b52343262..c1c349086bc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 8a38f962858..a796ddbddc4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index 3657c99b060..cd2d7972f0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 929eee92da6..592768a121e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index facb2bb4f5e..7824367f87b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index 32139a7e67c..7f07485e08e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index 7c4fa4c0f8a..c9d64acd3ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index c9d040eba31..8d8aa7b1407 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 8aceb49eedc..585c54a5b78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index e81c2dd3f9f..53e908467c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 70c3f7425ff..48e6c69b555 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index f44dc59e66f..aa3dda32d62 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index ddc2046916e..d319c671e1f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 85d8099abc5..2986e09860f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 6debb95cb57..b44acdd3f3b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 1a4487f292a..da358ee0e1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 19e07a14190..2127ef3ada6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index adc00249ccc..cfb23ead044 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index cf3252420e0..57db10fef10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index fcc357a289a..e854d09454f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index d74ebe4a8a6..58993fbddb9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 47dd5a3b7ee..58588cbd89f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index 8472b004cb3..57abce25ec0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 7d7df4db6ec..73a9963f1f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index e2ee48a6b5f..e5d89fb2d20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index ad37935f0ed..f69d366a327 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index 767fc96eacc..ee0f051f770 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 9b27e8aa0d8..ec455a6aef7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index a3890c90eae..a709e40c51b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
index 71f4f82d195..dc2c9d9ab75 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
index 025d2fe085a..9fbc08e5384 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index c9d64651295..3f46fabe37b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index a549857a4dc..3ca5a0b0d7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index 99797a3cfcb..a17b3ba8c17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 0c266d63d47..fda77dbd15b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 9e66977275f..140fbb9684b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index ba464fe3ac6..be879a22314 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 8290ed5189f..95973ce7308 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 1991fd3d354..fb2ae653afe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index 85286d15a71..13669d31a69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 183f6364f17..0f8985d1427 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
index 81c6a2700df..26434dd0a05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
index e85befc20d0..62e3849d679 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 832ac698a5c..6a09e53315a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 4d59f674b98..ef0836b8e87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index ca81802a256..86f6a004c32 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 37d6dbe8b30..c404fcf03f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 31516d48b3d..f3f701fd230 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index b84f1f575e9..2ea65da273e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 2daa6a24c58..90a500cfae7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index bdbab61818d..79c96e6f2b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 0f736f19b6e..714a08bc7bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index bfb5349a641..ff7e409b8d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 08e015bf785..6e914683ee8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index ce605fd5f5e..1a8ab2b4830 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index bdd2cd63dc8..4f8dadde3c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index aefce7aae8d..8f130d28a17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 5dfdefd487f..75eadba3d1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 4aefa909094..4fe3af9ffd3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 070cdcd6fe5..48631e39d26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 8bfbfdded24..3b10e291d33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 85e9536c51f..bbc4061c2d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 7ff64169d47..2d2ef35f681 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 9cf165fc9e2..47c51d9df66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 412dd7319f3..330d3f0f907 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 4c8dcb9bb14..ea15eec3189 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index e5126a170db..61323de7a02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 0ee559675bb..c59ee9d340c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 14eed644445..51b9ba26564 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index b07f6b7302a..72e74ac6802 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 4ebdb286df0..39c65173264 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index e17185329b4..9af146296a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 135a4fb22a3..4000dd3467d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 3a3f291f176..547c19ff485 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index b7fadf8e55e..ec64d6fff5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 7ba3045ef0c..2623fe82db0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index bb303226b7e..adce8bdb569 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 57801468115..fbfb700eb94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 6996618954b..68a33b74a18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index b73f65da88c..40e7caed485 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index dfa86e093d8..7992aa6e009 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index d996f1eb49f..9c4011d2817 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index b7f20cb80a3..b174ef4feca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index d358fdb4423..6d987fbcb52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 95d57c2b9ce..9fa486e6ef1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index d90b3b8df34..5577dd290e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 0c84b5e9efc..3dfd7e3526c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 852e16e47d7..5fbda64f1df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 0d265edeb9a..b498a7d7a31 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index c2450a514eb..cf30937880f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 5bc159a13a3..5123048a961 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index c0c2ae7cd90..1a6b8711327 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 6dd1c699406..6ecead7d50e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 7f284d7ab69..abaf6d3efb8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index cefe89addbc..849754d0a23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 7e9aadfca7e..c9009ba9bb4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 3a2025adf47..e10011d34f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 9120ee2daa1..3a8045104ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 1897e65d091..7e4275cad39 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 05e3c5061e8..130958a292a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 9a50c94e13e..40606039bed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index c1341fba415..35fa4d4e120 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 5a14370027b..8bbdbcaf518 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index b40e78125f4..f765d8e5ed4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 9229b712c59..81abd80a316 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 975bbef9eec..dce1889cdaf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 200d2581d7f..2d300936294 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index c4f86b6f13f..7490ce2006c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index e561639229e..efa72adcc59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 9e05f3169fd..6c5960010bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 6ea52cc0b8a..c3f9f1540c8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 9d7a35e7321..972258f7c09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index eabbc62da39..a0b43f146fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 8d4ae17f4a7..e4b8632fdcd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 7abbf86e45c..f01ce4e0289 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 5964582f93a..f0d6a0fd054 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index d8d232ae484..669b174a081 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 23632702001..f62fcf98e40 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index ae3efa41619..c6c6a1e4837 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 9df73a22f39..b74b0d48002 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 86fcde84c97..e18a7d6a716 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 91a00709615..792f0231e44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index da9e364cc25..a3d13d7ef6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 0aa29edb30a..e4dc43e104e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 5141185712a..fcc9e44e29c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 866d1e85d9b..41d15b0fcde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 380654d5817..8f54379c868 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 59db4660452..fabac2224ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index aeb58ff3e98..9635d1c76c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 8b487f6c0c7..b825d86ed65 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 0688080d1fa..a8231d341c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 239684dd290..ac410b09142 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 1e7e81a29da..53d23827867 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index e2fb1961894..35418f29644 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index b00cdd18680..4d62a43436b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index e938e2948a5..ae89a6a0880 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 4607b2f2904..06c3b88fb1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 866663bf416..237a5f0f491 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index f692ede758e..ed249742bfd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 6901246fd9d..ec9ed5db268 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 4e80eb02c64..545d5215b80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 3b18bbb823e..0a8b8a98c18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index a3a534244a9..a4efc8f4d6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 5953cb46675..5ff897669a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index b42b245873a..51d8fd3ede2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 127050a1515..bf13e92fa48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 89b20840265..d1fddfb6a42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 5d1e2edf777..cbdc2336ada 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index ac2de9e9025..8563ebfd9fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 7be8878c8dc..6365a8bcf02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 8a8ea462a79..35002016c5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 6d84859d9a6..0f0d047fffa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index 2470adc1294..4c9cd6fdaa1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 72447eb8214..d9787a4e6d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index a8750785088..8a7ede0d2dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 664289ffa68..a150b8ea76d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 01783b97c69..e1c0b2a5b5a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 9cef3616cb7..8dc5fd5aa9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index d18562e64c7..f74e8d3cbd5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index e0cf6d2d9fb..71d01012864 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index bc042eab8b3..c5e42caa8ba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index a9c87d94ff4..1a5ad9592d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 71c9c907358..0ada60ada71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 0ee1eb93da8..17379055260 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 4bd1a03dcc5..f9673638209 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 2642535512a..d4306b79349 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 06543ec39db..0b0ff184b64 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 242d995189f..414c8723ca1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index f101b25a201..ba53dcf3508 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 07258ac6c72..0525b3cd2ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 43cf88c2f65..60094d7f0ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index ee250105544..35b705119f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index e7518ed3bf8..d5908e7ba78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 5d7e052a1d8..3be90e5d4ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 332388ea25c..d64247c6447 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 428258e2ba6..f9769b95f9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index a0888ea6f73..7c9b8c83221 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 8d63366815a..483a43cddb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index eb5e55d20c1..f27831c876c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 70611c502d3..44042cd5008 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 53d81620f4e..2385c83cab9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 41c700bc81f..bfe81dde602 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index daa1a3aae85..c4305ba0bc8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 535f3bebccc..7d89052f52f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index f874efccd74..738ef6b1996 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index ee647402d00..f34d5494e7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index a8425d86c34..7599f2ff243 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 9b427a8afd0..3209281673b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index eef34cc540a..e5d16e24a55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 2a00a0655be..8009f57b1ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index b7f17b1ae4f..b702eef57fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 30e950dd1aa..b97825de1e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index d27633cda98..5c73dd4d88d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 58fbc1ce17b..f2a25196f71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index f37fc76170e..79c61faa417 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 53967957173..3c2117ec022 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 07b34aef6f6..aa9af02fe1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 19a4b7dc36a..43f41479755 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index f841857ace0..cd10ed2b6b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 39fffb013a1..a1538cc41be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 3acf7cd000d..4fc2718a910 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index be3189f7605..2ffaea9826c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 4357b4568a2..c997e228e17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 7505361c716..2872d59fc51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index c61dde7781d..dc7222d3732 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index c56f4990bb7..a2c953d6e74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index f8c686e48b2..2bf98b82119 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 55fdf3837d9..0af634a6d27 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 98cc61436e0..f3608e17eb9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 1110ef082b6..57d8f47d4f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 00e304fa40f..47870a7628e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 52103eb8d41..3d1253229e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 85a8aa12f6f..8c0a1ec4eb7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index d69b1f9dbc5..eaf45d6f7a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 004a25c2977..9eaefdaf1ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index c194a59094d..bde05c454fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 141da1af782..7d723ab86a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 103b06e923e..e04b8253413 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 4fb66f80c3a..413e8ad82a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 313c1bc368c..2832c088422 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 261516d3ba7..78773bd5e71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 810f1c73cf8..3cd75589c30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index 8fa3c37a9c0..cbccc42abda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 93c5d95b994..ccd15b3bbfc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 1441f041505..7bcc2189a06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 8dfa7ad6b40..052a9df8e71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index c4d2401e1e2..92b1559f77a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index c0ec1c7b35a..c047ae9b3d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 765e2d03fb4..a1e4d2d8adc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 616eda833c8..7a1fd76a930 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index b3b9e780904..9b7cf05f66e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index 0e530132808..6c6bf43a24d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index d14658ffaa2..adbecffb505 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 47f1cea345b..a0942713fda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index de614235731..b37889b65b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 69833f84e27..dad6e7ec9af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index aca13b25172..0e379e43123 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 41e112b0966..1f7a8985a9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index e7de640c72b..2cbb6fd3489 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index fa168fd9b11..289aa3faacd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 506c4957d04..eaa417eca08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 553a6fd3881..2d2c6d6d04b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 68d11650ada..7e99eba7a8c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index 5c98dc5bd38..a294cba7c53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index 96b5d35daab..0f0f3f586c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index d48f34cba67..29598521aae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 2321745a58d..03618c360eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 93a43ccff7f..1e785d961ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 48f17b2bf82..4e046873b80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index e4e1f25613e..c61e82351ab 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 5110aef69a5..96fc319aeeb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 688a5ea7743..1e54e3910e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 9f5d1fe4c00..a67da150084 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 5344928b729..b5c0081ef67 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 8f36bc8a214..9aeeff94ea2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index d14056f807b..0b75d688875 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 384c0434b07..2be11cbd75b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index a682eac220f..5923bd66f21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index f86c2410971..cca4a0ceb6e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index ac48fc6aef1..8bf793b5b86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 2ce423d390b..7c0a9b9bc60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index ff00fdd2eb3..9c2b85af9b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 05ac113570a..96bc005ebf9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 33345545211..4e35615bf1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 26263c5b5bb..b78a720df68 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 583f80e75d0..7d5905ba238 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index a90a29e9d88..5a8e1fd812c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index a44157c8f45..f4a53c631d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 754a7932af0..d6b14df4795 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index e9d4ffa7f2f..b5daa974365 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index cf42f306bfa..7fdc05de8d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index a1c3a41153c..c5b705bef4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index 53cc66bf3b1..926ed948d51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index a7ca6718c10..0bb7ff22833 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index ce275d2aa72..b1d5c24fdad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 82f4495695f..29efe5be1eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index b92937fdb54..79b406bb6ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index bb56f640667..553334e038b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 6b658e12a38..c23a6cdf198 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index e3c366d8e6f..7dbb28b150e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index f77583edb57..0f8c2d41b9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index e93152dbca1..85236c6263d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 442a92535e2..26767fab0b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index c977d6abf0d..2c98ba5babf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index f6ea03447a8..3a4e85ec7e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index d5649a0442c..7b0b4552057 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index db7320e4e3f..274f04abe69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index 790b470b6fa..dc7dfebee06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index b0a1155a7b6..b2d25b69e30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index c30696cc711..86ad248198c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index 6c0cc53bb13..622f77bde2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 109a92e4080..dab704a425d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 3af24e81b45..878d948ceb3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 8c0cea74794..603ecc55779 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 8d563e77529..43a132e6808 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index f1b8cdf20ba..1bd76067b27 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 167f2d2d88d..d00194b1437 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 6a8dba9757a..2daad670867 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 06eb373aed0..1cda061aa01 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 5e2a108f2f8..735a4acbdf6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index 328682e0974..19e5416cb3f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index ec2a37a2caf..e45cbc673ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 9dba3effaba..4539d076c49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 6320d8efc72..7f3e435f11a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 02919e7ef97..81607785f9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index bd042ca8f17..a8a6aa1d828 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 73f432c16a2..f1eba7aacdc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 679ef88d994..7ab09331785 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index f9eaa06a95c..29ba286e378 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index b3340eeb24d..0d1b267039a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 45e2c2760a1..dd07624a999 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 43051d36855..38df795e3a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 2e3fd52e4aa..525df39fd4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 5b368ab7bcd..a4533c649ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index b4866f9faa1..037bb3fee46 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 3d6aa3805a1..7671fa5c539 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index cd4c32b9393..ed415758d06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index 387714fcb77..085a267a574 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index cd4ee2d6fb2..cc554724b30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 16dd0012855..011ffcd01eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 20ba4f05912..3f7d38759e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 81e8b03a642..f66e36d7a9b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index b3a4df02596..e10c1066d64 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 09aca420769..b3424b1ea90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 1497633d365..40c2b7a9ff8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index f74a4c0a14f..13b9d94f53e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index e230f1cc900..e50f65e16b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 7c5f43da6b2..5b5dd12e596 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 57b33f26515..ebc18c61cdc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index 9bf8885fd84..06becc108f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index 8c6c5575988..88a7cddb0b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index 180b6f5c30a..ebd68284221 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 5f8b261c504..b50c0b60db8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index 8f44d1179d2..df69d477669 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index f1955a0ae5d..eda910d0922 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index 34eb383a5de..37370379123 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index a76e568c7a2..56e124b1470 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index ec42bdaf812..2d1110639e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index a18a4ae4d92..22fe64a0945 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 602c4bc4cfe..2ae690c53d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 77b4460ea8e..b14908a7b2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 63b244f94ff..485c8784c69 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 8a3bdfe72eb..f81dd12dc60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 1281bc7ee41..484d9ec036f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index d78713d8c6a..e566233091f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 22adee613d2..f68dac93582 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index f28f6917a50..7ffc2824a8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index e2e7ded1497..0834f026a39 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index cf2b5269048..6f2de0eeff1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index a7d5d03782d..51d538a7502 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 504ece5d888..09e9945924b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 709f577dfc4..ebd39b1026f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index c5cbe784834..3cefbeb1b7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 4bf9dc87276..1f883558c63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index d1b3228de87..d705e0ad324 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 562da359007..f6a28d48c1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 56bf9a992ef..a38fcd1affa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 3fcff7ff5ca..9ac2ca34857 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 7b87fb43bc3..1dc4c4cd4d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index 5d0a7069193..1c28100003e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 5997b079765..8abb5198b86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 68dbe6d2a52..9d4630b46c5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 30972c3a693..58e0f26e2f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 3646d06a6d8..f47b1f37046 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index b885670555e..b45744a94ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 7e1b68370d2..d2061267c24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index a04b753a15d..5f35a68ef06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index d0009e0462a..e9787edaecc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index 48bba7e7e8c..e00a911d55a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 61273ce04db..699e73a837f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 2f5e63f5f6f..fd369ed2ec5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 1eefddd0bdc..426a91f7370 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 160c3cae70f..f0d6cdbf00c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 203765c8c30..18250c8c3d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 7bbb54db6f9..019debb40a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index 98c847f5051..849efbc4e7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index 6a88ec1b6af..d3ee7cb684b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index a66dd71e7ed..0f8d60ca672 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index 362b875a990..f09d000eb72 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index 739a649e2b3..e28acbe9429 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index 205080652fd..948bb087919 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index d194c9b2392..ebf8d26f517 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index 896f4df0751..990f752a23d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index 9939c679481..66f41a0e325 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index 1796ffbd26a..8e23ad41ded 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index f17d565b43e..3baa66d36b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index be3469eb37f..e5c060c86b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 9b089cdac2d..8b036117d70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index a58e196c216..e165003f6ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 4e95aa3c58e..42492e23b77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index d97f749f00e..984b0790d42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 630d21df237..9bcf3910c1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 58922dff54f..cd8c557f05d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 05bb00af49f..c38f3063536 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index f737207b916..b38e3d4668b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index 85611c41e3a..a90739dc499 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index ab0895dae0e..83b3601256f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index e7f413f4bad..72dcd1d2738 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index 17127f4d207..b56aa7a2c44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index 851ffa37b34..bc6c1bfd1ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index 044d1165f86..6087f4b7db9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index 0c8bd4f1373..7d2599a1b71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index 6f890f66fb4..6581ee64e4a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index 397fa9cb469..9403ed73bcd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index 6fdbce59c04..5345da2d6d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 21b089ea62f..7230246dd23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 593531dc9bb..382334bba5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 7dd540b4afd..8481ed5ab38 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 985461620b5..db04cf7f5cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 9a8387d0b41..d35d0c25cc0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 01ecfe03cb9..1a6e2a4aeb3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9271c730a2a..117a3dcd2e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 69ba51cd605..bfd21f6f15f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index c6ff5f31708..2e6a113369b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 91fd73f0bb7..b9d2ab53f9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index 24aafa27b29..4dd11a19be9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
index cb33a237015..a65eaa7901b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
index 322319fdf91..7d5e9f51eef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
index f1a38d55adf..bac63c5fb0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index 508405bb881..60d5073c3fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index fafeac9f988..6be18f7699d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index 4b65f3066c2..952e77c9cc6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index a47d8059b16..48f71be2eb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index 5106ece01b0..a28deb3c0dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index e0c5a01d588..2ebcc268d93 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index 6f0cbb6da67..6425c693b33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index 0f840f6b3cc..fcae5517b70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index 30ba21dbaaf..92437dea18b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
index a45899f8680..9d2f1dc7bb0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
index f28a7dac315..77a7c7198da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
index 36647bd217c..490c294ced5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index b37a41a0f79..22f1f3bdc72 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 29185f3be8a..bb47761b3b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 1aad94ca47d..4dc7edb6f57 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 20c4b42180d..11d7fe3e261 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 431bcc29631..12e2c923aa9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 26ea4bab71c..269c233f650 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index cb3b22bd887..3dc041adb2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index c1e09f76152..7985b8b5397 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 9d8a29e3b21..6f2526ec2ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 18bb1796e0f..408a84a46e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 02d240f4ef6..73a6d401686 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 7ff1c2d477f..db3836944c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index f3234db7fba..3e93e19a718 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index cda5c213858..f556a17b5f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 01b9b2f6d45..966ccd4a906 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index ab501ba4829..b0f1c512bb3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index d731d349adf..26ba5374576 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
index d5fce9bd4c7..3c24da11403 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
index 1bd6d4d7af2..5147d1ae55f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
index 3fadc6ed1d0..5f043f56d9c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index 5314bdc4292..7235b46f693 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index e480475c4c1..898791470cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index 5b663c86663..915a0e04cb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index 1f8ad54a5e0..2b5c254b315 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index 7cfe3c95608..448fc03146a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index 3b118b1573c..b71a1ba2fea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
index fe0acac1c2a..c23f33e377c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
index 994f4980029..0f8a6123318 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index 55ea446adca..25e7bed4966 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index d969209f05e..0366ca590a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index c870703a446..e43090fc94d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
index af83435da71..94737a8ad11 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
index 939e659235b..7f20701fc23 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
index 96e809bc922..1e0251a14db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
index 133cb3f8152..a04b093f052 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
index 2d4ce605db2..4c888a8955a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
index 62e3401af57..ea5c378b938 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
index 9cb8d09c957..f95d9dcf862 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 474c14bd284..2fe55648eeb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 4527f4c14d7..805c1fce6ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index df2c18b63d7..3be3cef8fe6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 5fa94c07a42..001876c67ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index f1462a3904e..d065511201c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index f3f4eacdf57..8372e89bb96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index f113c71f88e..0cb91426123 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index d4aedcd44c3..880ac954014 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 50e35f214eb..d1e21f26bee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 295a8e28d36..81ea510e482 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 3dcf63d3175..66353279841 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index a5eb6db025a..d9bc87d7ed1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index ec19f422cf7..f4c0db2b33b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 551856e96b5..e0a4c18164a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index d19eeec61e2..ddf12c7dfbc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 323962143c3..967c856ca94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index b0a852d431c..e2c794e2e27 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
index d12ac42bec2..1d53a856484 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
index 8d2050bc6b8..11002b84ccd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
index e77b1cf749f..0660a7152c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index f39dc4a867a..6dcd7f6fb5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index 80794c90460..0776180d9a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index 0666e64d116..38e9578454e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index 8b2e83b163c..6f0993c8010 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index 6e4127e8d8b..9e03d5384e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index 5a821e9be18..1a928cfec18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index 9f6900504ca..ab822dec774 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index dca6f9a5783..c51ebf6c472 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index dd77fa1e854..14ee299d92a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
index f700a2e4406..ead14cf5f9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
index acbbcf40d2d..1ee7fd41367 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
index e30f960523c..0110bf0e34f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index a6c9d8d09e0..12a1bc66e0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index c062ad75f5c..05ade9a9562 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index af5ee5bb983..ad0fa26cee5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index f585f96f2fe..074dc1c008c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index fbc89f63472..02a8550756e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 3826723cffa..c67cc2478a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index b7b973ed00d..e53c8315664 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 0aa06dd0477..3e11ade1bcf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 8c5db573dc9..27c4c842c94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 068f3a7494d..f28e884825e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 50c0bb6d499..5c8ef0ef3e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 1017cc3a28a..bb9bf2c1ee5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 46f518e21cd..a4798d7b47d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 156c0a79114..0b58c64c200 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 13734caf4c7..3ab27355d09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index f921e398c87..6c8d7ecd7b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index 739830636c1..62b85068c20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
index d0044e5908d..efcd74ac789 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
index 18de1edc8e2..eb84455bc12 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
index 48f57a97c61..dc71fc362ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index 2d05a1e8a09..8752f5d2cc8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index 0b968145541..4c3a3e733dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index b2b7ce96cab..33640559429 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index 3f497621ebc..9acebe2f0b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index b8d150d39aa..d1f8677bc8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index 16f7ed4ec07..a205d415fa3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
index 32b1e0dfab8..dbffdfd9b70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
index 5299292a39a..ac598a4aef9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index 2ff8ed8e516..fe796af905d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index 6fcf861fd26..df0b66b578a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index f523700deef..3e6a5ef1e50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
index 41d8dfb4063..fc8d3c41bbb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
index b7357a73361..3291f436ea9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
index af24a7c3a0b..19ad046a8a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
index a70b0e72e38..c8fe4c6ec6f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
index 03018d57bd0..ec2f7efe8ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
index 42e86391b26..207a092d679 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
index 09a483fa928..6ca54f81610 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 614d050f1ec..d8ba3dd25db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 1bcb11e8e06..6d3dc7018c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 744d2ef10e3..685cb213ab0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 84b48ea87d0..65b84cbd52e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index b6b7315f641..931a865b0a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index f1a842a9161..44da9c8838e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index bcbc4fa6063..3e272c6f36d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index dc49acfd7bc..4b94af4929c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 5b1f0f8a5f0..95d6345f7c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 5cc2ca54a08..17f127f6036 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index b5304e12221..bfb222a4475 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 5cf441b8bfb..e989b00ce58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index a259914ccb5..a1f1e0e6f1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 20148fefbc0..ec4786e1e4d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index ace1c310142..baee333cbb8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 8479327c2a5..2041b46c26c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index f6b970af922..2fb347ef35b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 792597f6ab1..0c34da119fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index d084d7d0281..f992e393925 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index bea3f45b42f..e1e6c13ea35 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 96a6b20c97d..fc07b47fd64 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 0dc1eee0d87..083891dc3c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index d19621cecd1..07601e37eb0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 957091cae3c..811265f11ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 8dece5695f0..254a29152f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 1d8dc4aa39e..f78fb878fff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 068d7533951..9c5035945c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index b100c0667c5..4b238c0449d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 1303bbed50b..a860c257fd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index d311f8e74dd..a798c85d6f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index d3d12931b34..3955b78f7ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 9bed9572ff2..f755d35c825 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 18cc457503e..240a3c7f186 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index a94c064241c..8d18e84cb76 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 4bc11069cb5..38edd1b85df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 2d3bc04b7e1..95f4a17a2a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index e88fef892a2..f80ba375958 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 3e1ab9b5993..ed1b8c033be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 3d7ec735d6a..050eb6a3904 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index da884876476..143f3f7c87a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 330715606ad..ffc81902980 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 41dc81c404a..5d8be2bd928 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 6598ba613c6..7ceb389b35b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index ecf97d6f5d9..f3f5573b758 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 327ad157116..55edfc93760 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index a98a8bb315a..902fa3341a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 1674455a5d1..bd278695088 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 066047220a1..331f865afb2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 7dd5bacbc01..b26af2a076c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index f05e57b3573..0d7bdf20697 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 371633ed2df..1360edbceff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index d3efe045593..2f99fa63217 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index e1efd9f8b89..f69c1341e09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index b1548cbcd90..e7ea376cd14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 83ad16ec11f..859c7267ad5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index d55fc452fbb..747c8e1059d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 6ca3f08f728..9aa77a78c63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 0dd755c1c1a..0db6b0fbc2e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 143fb97db81..95eb256986e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index f5d37d11e0d..59de544a1c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 9e52e01675a..42dffc718dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index fa8842df5a4..a1c0ad2ecbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 43dff534e21..4214ed39789 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index a72f47dd4ba..c74fdf48aa7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 1ff937f5767..d6c256cdd00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 59b7ba10708..84f50a7242b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 3179c6ecbd5..a4c9484c8c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index f62209fe6e1..5ff57615500 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 05e2c7ea8b3..214d0a41e68 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 5fbbc7e5180..21f6bd1faaa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 8f895f658aa..a7054707dc4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index b3c39fc9f3e..62dbdaff92b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 8b06f445e85..3877d5bce4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 89b288f85ef..b537c0352c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index dcbd51e3b90..0881853070c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index e4d0c83510b..390e5a114d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 2d55efbc28d..21ec099f4cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 04f886a39eb..9c05e66587a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index fd58e4e70ab..2bba3d1b958 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index c06869b7b8b..4e46c27514d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index adde522b522..43b78c36946 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 51d88233bfa..745f65c0488 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 3e5400c007f..e503b77b05c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 1c47d057f14..9067040bb86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 0a8e19556a5..7b2f46326a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 0f894d0a416..e471c1fb030 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 7df421d68a1..dda3d2fb493 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 65a0315226d..5e3c7911cd7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 5f39f8933c6..3449a347dca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 9b405a8ff74..d68b3f0d60b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index d84c7f5904c..0d32296e8fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 207eb95f8bc..e0fe2ed9eca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index c371de93ab0..5a66aa2ca70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index a76bc5841c9..228473d37a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 0bf104829d7..556a260ea63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 24900cd3ba8..e9f49f4ed9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 3da8fda74a4..e225adb44b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 3c95f290262..a2a97e73d1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 52b7fd3c93b..eae326f66c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 5b417f5fa0e..870b555c7b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index e3cada3c95c..92186b38318 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 9c2223229a8..924ebe5e76c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 956f83b91ed..8e374ad73ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 9c90fc295cd..698ba1f52dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 7b605a64df4..c3eead4ac0c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index e58d778fe17..b1c1f720a14 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index c39673a685c..f0082510aaf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 39b3d4d5a03..dbb8da1e03c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 2b1537c99d0..09aeb8fc143 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index b7fc76ffab3..e2f73ada79c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 42b67db7bb0..fb86bc5c45f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 575ad28f89a..637f7d80196 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index d14b0b5a377..649574394f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 80052e293d9..1bb79c1f38a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index b797c7167ed..a9053cc0649 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index e3e35115f51..c7536fc5080 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 34ee1e680a9..b27ed1830b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index ce2a8629bdc..39a7b701c33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index ba28809961e..27f637f8447 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 137aa0a469a..3c11a22da1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index dbde2fcde46..b02da368869 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 2e43ff0392c..5f542a4c16c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 09f4fd3dac1..a5a9a71c2d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 5e664817c57..be363d79516 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 5f0426410b5..04e317062aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index a70b6773a5b..3504c73637c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 27cf9918048..597f4092c2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 4bed5f9bf75..2177b2407fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 1e0ecb22618..54b2947dc66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 637e63db7a4..94f10a8e9de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index a7713596022..9463f5394ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 84d8cb7780d..3838698b0a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 2283585fa45..5a1df9c256b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 3786e3c2ee2..0fc489100e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index c87dad26607..0028b48d0b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index d7c00a2cbe0..8b2dea1cb62 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index bdddd53ee04..71a0b692afb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 6f51fe1845e..48861eb9bb7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index e30392e0f96..c63d9a1608c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 79ac18fb22f..e2143e1a320 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 7146324b317..b8d84f7726c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 20250b21f83..4f36a9cb357 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index c7bac19efea..c43e52e9dfb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 72e3f0005bf..8edd239db2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index b11b48f2b70..873b26a46eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index d1fbc240322..f0d5c81eca2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 79161c901ff..c985a404544 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 2284e99ec7e..9881576a69b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 532ff5f00cd..203c5e73cbe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 9f98c017984..41025c58578 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index e7c6aba4352..ada714dcc50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index c6acd2b5dea..a574b130411 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index de84f49ced1..20a3252bf2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 42190ffdb98..d48173ffecc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 1396c3194bd..c5a1548b12d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 14869d14cda..0ee367c9316 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index a332aaaca37..3e6c3a175f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index f5b44c6dff9..533a22a7241 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 9c85284827f..335ff468d90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 1ed6966d7c3..32aab014434 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 33d85483930..a92d87e2782 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index b6d35027965..6f9417785ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index bceda6b6222..ad8d9e7f190 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index e4452e8889f..a218fb4980d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 5ec40bf6127..f3fed6c88b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 3f20ecde7d3..3675e2391e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index bec41c1ee04..a94bdfa5d53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 5751b140f39..623f6a6e81a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 63efc923d64..a991f0c6757 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index f6514637935..1546f57a7df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 8631f9768b7..3877c0cbaa2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 9012a8b3b7b..8542943aabe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 34dcb856a52..f688eda4732 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index ead01d68363..aefc8786e2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 2ded70b2f4c..107e1ca1a67 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 0807c9cf5cc..2b4472d3554 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 43d514d8d01..5889d9e90f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index f96c2bc5b76..2edd19df54f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 8f24883a35a..418e84a8210 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index f8cef232a87..d46cf842c63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index ae72d6df240..0e40587a040 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 6ba8d503428..538500ad734 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 2a1c02fbfe7..58da77e1a29 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 5d2f1ca9e6b..85dab619c2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 8c9214bcb26..92c2b51d15e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 88ef542d163..b9818652513 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index ff9fc6dfda6..20f21df5657 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index d009ad41b82..7c597fbcec5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 56f21b478cd..7ba85fb790c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 8bbeb71b993..fe6b2b59b8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 0dcdd09671c..7cb4aaf0943 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index e5f30e2116e..e7caa273156 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index ffe6cfd0fd8..b0fc558d76e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 3bc89e8aa80..bac4c36dfe5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index fa5f9600d59..0d76c92864d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 5523b92f215..2b24a45ec52 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 2c091a19091..00587b4f18a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index cafe70e7b5c..3bcc6e82a70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 571ecb99fb9..387a0b3e6d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 59d593788aa..e19734a542a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index a9ca0f209d5..72eef24fef5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 02ea40247df..c789cf6d302 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index a8376076e9e..a24af8beb2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 02d24f43981..a2773bfb160 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index a57cf27cb9d..72cedc5e35c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 2fde9f85ca8..612d7b36280 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 1f464c65115..dca3d062994 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index fbbefcfc327..2c5328ff25e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 5f476997226..54dab293d80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index dec87409692..9899e2f4e6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index d0ee8283b49..98a55358c7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 3d7deb5d690..d5843c83a95 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 1e1d7cc7d06..f7d63a639ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 2ff7491aa44..bcf8f70bbf7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index b669e643b2d..eca04d52b02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 96297ef373a..91d7ac0ab4d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index fc280d887a7..72eed78e5a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 4f41d3a9b3a..7a45e12f4f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 5e1fd3ad072..5facb852896 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 091e47be9ab..8ed4f634005 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 2ac8da1378e..70403fe5365 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 9b861d9028f..32dacf7ffdc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 6873ffaeca9..433f51b1431 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 362df9ada72..b23ffd4b8e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 2e89b249fa0..08f7d092894 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 7ea56f60dfd..f5bec43c8b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index dee2d6d4912..c1d52ddb514 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index d72a6fa952e..5225f28f850 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 2f5f1cd7f4d..e17dbf9ef6a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index be9327362f2..613eac440b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index b1156ca958d..dfc5328013a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 8f6459a49fb..ea9605e8169 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 72d2fea16c1..8b5e5cd9c0c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 4bf19c93d71..0913d31a24f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 667a01425b5..2b06a9ab2a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 3ac4b60555e..d8375c93426 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 44d2d7ff531..3353f707404 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 2f27941d33e..a82cc859c33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index b75f8d3c179..8f57b3335ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 86c2a31212a..3991c324090 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index ab9d5a2b934..f61537ab2b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index d421be327aa..5dfb2f8a164 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 82624d67db7..50010aaeafa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index d9503327116..d17712e1d17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 2de08cf93e0..e514cb738d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index b19e9c63736..679128d15f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 70cdab12318..8afd60eabca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 896cb0ffe37..f63430fde91 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index baa966698e3..6f78f7ab581 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 3c8d120751a..10fca8ad729 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 410b00d95ae..f60d3ed06cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index f469e2034eb..44b1b21a711 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index cb5137b7110..8d9b118d13f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 756fe3d4128..e9349686169 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index b7651581b8e..894676e8544 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index ce86369596d..42b84b21508 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index f1d12065c07..9383af1ee71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 9f7a47c8262..03c22def281 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index ec2dff0e842..f14ea6703b3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 4dd8bd2b860..de791441ea7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index edb482fbc03..83707cdee07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 1d631cfd83a..2b92b33df18 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index d6cfd058bc4..142267bd452 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index ff8a7f68c5b..738f5c34ade 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 0c6165860da..a3be0469c9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 1ab7f58d797..29ac25d14a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 9e850de0579..3a95f9f42b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 41f07968946..177abec135b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 1f93d7f0e47..8dace833026 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 178cb8b1e25..5ba49e0acdd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index 037b8e9498a..4bff34e02c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index f4b3de94b4d..fa58ac157f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index f690596c58b..4cf2262dab7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 42e366cb1d8..aedf67b946b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 2b53b402bc3..4181c8a875f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 13af9b92e47..dc6f090b51b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 5eacfc71beb..22d449d42f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 3d5a0f56fbd..1492be672bf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index aefaa47a7f9..c35639823ec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 3443749f66b..bc5f3bc3e94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 9fd91229678..c458763f10e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 3250c6e5192..00e1d936324 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index cc0a5b952b3..c17379cfad0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index d18028876a3..faca9b10f87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 44f058b9c8f..b0c9e254228 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 46bcf18943b..ec8d76fc0c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 7dc7b6247ab..3334b1aba36 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 71c77a981e0..cf19b751ec8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index da2e9749c62..4c44cbce0d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 78a52999a02..61889e61f95 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 728c0b9fe40..1a03c3d9dde 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index b01056a5928..35f3e69127d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 724609f9149..9cc15eb4b90 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 3cdffe67ffe..dc5ffbd5de6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index f1575cb70fa..2ac2803d0ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 796a330f30f..5b22bbc5dce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 131c10be9be..125d2fb6c3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 912467477e8..bf9143c2874 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index b3412f7d80c..bdb66972d4a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index be489bfddcd..8aaeb884177 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 8408e1537da..ff3cd97f497 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 46eabada371..3f38a8a242d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index b78455112a9..b1d13cdf89d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index cb1a94b8680..6e02ec75c7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index 12e87e0847a..dbba2048bac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index d09ea914be8..f945a1d0c83 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index a20cea74b25..1ed2a0198ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 586afb4acef..ba120250e94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 292fe3a636c..46522686598 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 1483bebbdc9..0c7c8484a4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 17a4a30a9ba..d6b47ccbd36 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index b699abdddbd..96e137e4112 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index bbc37575bd9..06ba58084f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 89c51bc9f03..cc71a6ca689 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 3268adea80b..18fa571fbf2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 54b5692df97..bbfd11f31fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 6f196270e9e..d54694fb1ed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index eb060a8bbe4..6e1a080f9cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index b1254a01895..6343373d16a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 4824a3a1725..5659e1f17fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 853cf0f639e..bf32a5b6b59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 6a15feb308b..59919b70ecd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index d83a1411362..7b81605b86f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 8f5f30e65a4..4a337036964 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 4eda9b843eb..d767da3fd7b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index f8a8c2235b5..a119bd26f51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 1c120f03174..9045c6f9877 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index b2ed1f2a4b4..79164f38d4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index e190427a1cf..dabf50d51c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 07ffaf428a9..6a28a4c5e54 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 9651117f5bb..5c47aac9269 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 20c08a716bb..c5367f0e3cb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 0b306eb6fe1..6df7de3ecdb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index d91096748d5..88c6a0f7aba 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 346efd7b703..df434df7ab1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 1524fe75ef7..2a264a4b107 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 2bdcedada2c..a6775759e6a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 039df094f3c..91e3cd52054 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index b4dcff3d96a..cc66c5cacd1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 548efa17cbd..cbf5e1c28ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index c8832328a7a..f2035473523 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 600a384a030..f1837a8f7bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 51e067dfed7..3882bfd35d9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 93e2e7d60a3..698f9f64c05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 4bacdb7d0d0..5e6177d1728 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 7269727302b..07314409e95 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 83764468686..c6aafb2d306 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 9f3426e3497..3e27d0de2aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 3cfbfc69836..621ac5bb3e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index ce4eb22b3c5..8711a507ab5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 6e88e62de39..81294f80501 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 6ba93c949a4..d0b1553b75a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 06498b0a154..1d5ef969999 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index bf535f51d2e..2e732e6567c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index c894530bb07..2529091d31c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 8ce347a651d..ab2c0a35831 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 15b9c1e3e1c..56668b94ca1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index bd59c62bed1..f2593530884 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 3252b205203..b5c7283668c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 806e1fb2b17..d4af8f3c3bb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index e06e2f9b8df..82055a7d4a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 5bb6055a596..f501512aaf3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 336792a860f..d76e3c62c56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index b0db112d2e7..7f50fdbe077 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 6462ab026e2..529b4b30658 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 3541430743a..340e5d55d5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 082d5a98934..709d209649b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 33520d4c383..a94a77be567 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 1a74dd98cb5..289d7ee4ee5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 6bb1f146470..e8314118acb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 4398edcf9f4..3b744a333ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index e148449dabb..00c704c6e38 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 966bcab0dd1..e35b0a640e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 73b629724c5..19f9faed619 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index d4dda347ace..42b8a17f079 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index c0cb708a89c..50ab0a6eaeb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -15,7 +15,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index e291b25622d..14a6eeb2bc6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index b601eac442c..92c65585c59 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 8afc306a5ab..ede753c5361 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 284441d9529..b1f6e1dc1dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 2b2d2bc41ba..b69090ff2b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 2d6a2257650..a5bda07fa17 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 883c4caddc8..c61e9dfe6f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 1060b3a3fdf..d7a06eae0dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 62c1bb6b13a..bd9d445ddc7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 254b585a6aa..4bcfe741384 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 2cefa7d7a55..2f55f3f4bf3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 38b31583fe9..fcdb3014ef7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 75529cdac19..f6fc0deec71 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 053812ab43e..90db32e3818 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 16019f74b96..22605533552 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 8d1c47429a9..83d37336587 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 7ec5986c538..269dd5ab815 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 971d72f269a..5367d9e882e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index b5d1a81244f..999d68c277f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 520d166fbc5..6e57d20ba55 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 32ac74e3636..b5e3d6c80a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 50ae745b422..35dc6568c3a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index fcfba132f25..cc38b182da7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 7b227863492..dc3f4cf1e5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 7b05f73b014..e5c1855fde4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index cdfcef9f6a0..4724f670f98 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index f1d62e85da9..74f9f0e8a74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 5194038e4f4..15a6abbf5ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 7bb8efe9edb..d8f487a90ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index a872a8ab191..14d4f5fb06b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 53000e7c218..3e02f034fec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index efbaf4f75a4..3f20abbb40e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 978b57918e1..e594604429f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 5654b4acaf9..3e0dcd40d3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index c1598b359f2..ef5a7e6c88b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 17cb27df3d8..a50da9cb0cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index f5133f94c5c..4a01a41549b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index de4788d03af..0a66eea4641 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 13c40a28128..5984794f2a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 2c8aa643e08..0c02a2ead89 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index dc33c3b3976..f22c4142335 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 297561ebfab..c656d41de40 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index d41f5b3c7df..874e3cb3bed 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 3d7d6191032..9d54a271872 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 17e4aad57b0..43015a873cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 980330031db..ed58d7bd11b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 680911c121a..c5114ecd89c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 0043cccb481..34f650da7f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index c21596e95ad..1e668ae6d8b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index e91495b6765..19d80342987 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 381891560fe..705411d518c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index ed4a807f2ee..99c1bc56a43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 2079f95ee4d..607b4c29e80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index eb8677f1be1..1bc364522cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index bc3d297fa65..ca8adad1243 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index eac37782a55..b04ed3354dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 98230e1c097..5f1e54d48db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index edad4c61f59..a06130ce4a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 81d67f9619b..fbdaf4b0557 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 852cfcc7276..4fd95a894c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index f46bb775d86..1f65303cd10 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index faa3ecc5b26..4b70a9afd13 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9982670f2a0..f3c586e12e2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 794876ce236..9bcb05db1fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 65694ea8ef2..7b48d72c92e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index bc5fd8f7dad..5b539644181 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 6d21efeb108..841b54b5843 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index b62b8dfd19a..ae3939410a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 915b89d0d82..4e7d7c9b988 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 24f64dcd266..f48a201bbb0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 25f7b70fef2..111fa37e95e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index d50c6124ac9..d1cc1faef43 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 2865c75d9a9..155e9fb7bf2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index d380572c889..bcd5661d9c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index babc4da1eb4..a637f732ea0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 2b416d9d9c7..18e29ee1fc6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index b4610eec301..14ce35bd1eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 5d4339beeee..e9b5f75f9cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 6fce0113fa2..392c5783558 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 3e390334953..58977c3e7b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index fbc85115c58..59cc2bda485 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 606fa45a9f0..67625838e8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 8e8b4171f61..45d7f1e9169 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 1ca701f83a6..7d495b43c57 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 8fd755b7324..afd29bcd69b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 2c23d01e031..e12c41d3b65 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index d9741ac502f..e4499893714 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 6f2468ed73a..7544a66b826 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 5a33342e331..6c1bf133745 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 9d5f839b697..e6424cdf933 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index be690fd1ac5..284af1c6860 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 77fdb88b0a4..8c7f2bd5d37 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 9f6c2b9e090..5ba5152bc2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index d2839e7fbc0..fcf8844e900 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 223ef23df6d..698f15f58c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index d2c37e36e88..26b14d73149 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index a9ea7a4cbdb..c632fa8e783 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 344e99468e0..4590df6a015 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 74b759eaa41..cbe8df3c410 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 9c41c2408e7..69e5b6b483c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index afabdd7c4a3..177bdd6c772 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 3da7d6e7932..abe6ef4500c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 3a23209ca1b..15fb33654e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 25ff9fedb69..0d52c78f4a9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index d90818e03aa..ef9db2cbca1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index e78acc588a9..02678004f51 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 424becc9ed3..c391b257a81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 06241a094a8..03c4677086d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 548fc0fa27d..60a0f6ebcb3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 89c4f67e788..d1745b41235 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 13269e2374c..989c847a5b9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index c6af90667ee..33df9910306 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index d94843cf8e5..d11c4a1897b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 2427b7b1d9d..2bf06bb2110 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index ce86ed32d1f..2bcca81084c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 31ce151f68e..e4b835d8644 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 6be901d18df..20590be9e24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 6fca264dfc2..cf7b83ef20a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 3d03ffc03c5..96f5f8c07a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 0e6c3832783..8573cd5e8ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 7106118fa35..8bf8bd05ff1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 8ac0b0b7db9..8d330b11bca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index f7ca8733723..fe3e977d000 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 705d59b5d4d..4db7894a80f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 3e848cd41be..8bb522349b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 3606c5aba54..db792b5164a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 13e1494b527..c9b99a6b841 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 93960a12ae7..8cdf6d70efa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index ea1dd0988cd..9a41ab1b006 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 0d6c638efdc..581efdb75d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 11755f981e7..f2c77dcd96c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 0a1aae62411..8db2725b16b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 2f81ef0d6fe..11baca87b24 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 373ee4faeb7..0dcfaf49870 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 0d4be355e34..7f14e55c131 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 75a741a893b..1c44e334cfd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 62664614453..e349d5686ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index a6dfd3774a1..500d47a1c95 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 33a64705f65..21549ca927e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index a8af3f121e2..ca7d40ed2f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index de0ee672f25..fdc8bbef59d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index d44be78097c..e6518c9e479 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 3f03093ccd4..31ef2573890 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index a3f4330e811..220b5aa320d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index eea0a1b0777..f0b4658aec6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index d0302557ed7..4cfd819a473 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 796d6e1dd30..4ea3fe52684 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index b406297bcc6..0978fb710d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 3f2d4cb9415..7a4fe02b9b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 2db6b9be449..bf7140a15d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 066862d3b48..a40088b5b67 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 24e5665f192..763f6f02ee4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 85e5f3b8093..21065a0f8b5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index d8572397c20..21b9d284bfa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 9ef2d4b55cf..6911528c08d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 19f9f506205..cf7d1dd9c27 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index cf8accb0574..21882b16a44 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 40aa72119a2..0028373a419 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index ae0ad649a98..17eff823084 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 3ba347771a9..dfff2a541dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 113b0d05e70..3c7cea5bca0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 64288b1e041..96971a833e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index ffbe9ac4f5e..c98fa10e571 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 9ad749f8bb9..4fe678652d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 3a835f52f19..0f7f92fa907 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 40913eb625e..c2e04ad3614 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 51f1548b7db..1aaa67c96d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index ffcee216c78..7af45bc8865 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 049adf5283a..054b2eb241a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 4e691492849..faf51f1e759 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index f1ac19a5577..a9141695795 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 30429e29c75..6242cbd961b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index b9a1580e15b..90eb85f1398 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 0f657ff1c19..74f43287d9b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 63a2168789f..53cdc7edf00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 131726e2bba..406ef5dff60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 1fc3a147b80..993c9ea86b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 623783a50c5..d88b4994e32 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index deb4e20c74b..e5a4240f5a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 8b315b207fa..834e2ef0101 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <script>
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh b/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
index 64c28325d3a..a7776114379 100755
--- a/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
+++ b/tests/wpt/web-platform-tests/signed-exchange/resources/generate-test-sxgs.sh
@@ -28,6 +28,10 @@ tmpdir=$(mktemp -d)
 echo -n OCSP >$tmpdir/ocsp
 gen-certurl -pem $certfile -ocsp $tmpdir/ocsp > $certfile.cbor
 
+cert_base64=$(base64 -w 0 $certfile.cbor)
+data_cert_url="data:application/cert-chain+cbor;base64,$cert_base64"
+
+
 # A valid Signed Exchange.
 gen-signedexchange \
   -version $sxg_version \
@@ -516,4 +520,19 @@ gen-signedexchange \
   -o sxg/register-sw-after-fallback.sxg \
   -miRecordSize 100
 
+# A valid Signed Exchange using data URL for cert-url.
+gen-signedexchange \
+  -version $sxg_version \
+  -uri $inner_url_origin/signed-exchange/resources/inner-url.html \
+  -status 200 \
+  -content sxg-location.html \
+  -certificate $certfile \
+  -certUrl $data_cert_url \
+  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
+  -privateKey $keyfile \
+  -date 2018-04-01T00:00:00Z \
+  -expire 168h \
+  -o sxg/sxg-data-cert-url.sxg \
+  -miRecordSize 100
+
 rm -fr $tmpdir
diff --git a/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-data-cert-url.sxg b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-data-cert-url.sxg
new file mode 100644
index 00000000000..b5972d545cb
Binary files /dev/null and b/tests/wpt/web-platform-tests/signed-exchange/resources/sxg/sxg-data-cert-url.sxg differ
diff --git a/tests/wpt/web-platform-tests/signed-exchange/sxg-data-cert-url.tentative.html b/tests/wpt/web-platform-tests/signed-exchange/sxg-data-cert-url.tentative.html
new file mode 100644
index 00000000000..0d6bd5602e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/signed-exchange/sxg-data-cert-url.tentative.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>SignedHTTPExchange using data URL for cert-url</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="./resources/sxg-util.js"></script>
+<body>
+<script>
+promise_test(async (t) => {
+  const sxgUrl = get_host_info().HTTPS_ORIGIN + '/signed-exchange/resources/sxg/sxg-data-cert-url.sxg';
+  const message = await openSXGInIframeAndWaitForMessage(t, sxgUrl);
+  assert_equals(message.location, innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
+  assert_false(message.is_fallback);
+}, 'SignedHTTPExchange using data URL for cert-url');
+
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/install_chrome.yml b/tests/wpt/web-platform-tests/tools/ci/azure/install_chrome.yml
index 5a8dccd6e68..6bd5c2334ad 100644
--- a/tests/wpt/web-platform-tests/tools/ci/azure/install_chrome.yml
+++ b/tests/wpt/web-platform-tests/tools/ci/azure/install_chrome.yml
@@ -3,3 +3,4 @@ steps:
 # but the raw URL is used to bypass caching.
 - script: HOMEBREW_NO_AUTO_UPDATE=1 brew cask install https://raw.githubusercontent.com/Homebrew/homebrew-cask-versions/master/Casks/google-chrome-dev.rb
   displayName: 'Install Chrome Dev'
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/install_firefox.yml b/tests/wpt/web-platform-tests/tools/ci/azure/install_firefox.yml
index cf5089b60fb..de6d0335f22 100644
--- a/tests/wpt/web-platform-tests/tools/ci/azure/install_firefox.yml
+++ b/tests/wpt/web-platform-tests/tools/ci/azure/install_firefox.yml
@@ -3,3 +3,4 @@ steps:
 # but the raw URL is used to bypass caching.
 - script: HOMEBREW_NO_AUTO_UPDATE=1 brew cask install https://raw.githubusercontent.com/Homebrew/homebrew-cask-versions/master/Casks/firefox-nightly.rb
   displayName: 'Install Firefox Nightly'
+  condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/pip_install.yml b/tests/wpt/web-platform-tests/tools/ci/azure/pip_install.yml
index 6220abcbde5..f892deb9072 100644
--- a/tests/wpt/web-platform-tests/tools/ci/azure/pip_install.yml
+++ b/tests/wpt/web-platform-tests/tools/ci/azure/pip_install.yml
@@ -11,9 +11,6 @@ steps:
     echo "##vso[task.prependpath]$HOME/Library/Python/2.7/bin"
   displayName: 'Install Python packages (macOS)'
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
-  # TODO(foolip): remove --no-cache-dir when the Windows agents are reset
-  # between each job. Currently, jobs can otherwise fail with "Cache entry
-  # deserialization failed, entry ignored".
-- powershell: pip --no-cache-dir --disable-pip-version-check install --upgrade ${{ parameters.packages }}
+- script: pip --disable-pip-version-check install --upgrade ${{ parameters.packages }}
   displayName: 'Install Python packages (Windows)'
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
index ab44c559187..9f6f49e14a1 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_path_lints.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import os
+
 from ..lint import check_path
 from .base import check_errors
 import pytest
@@ -72,6 +74,8 @@ def test_ahem_copy_negative(path):
                                   "elsewhere/resources/webidl2/.gitignore",
                                   "elsewhere/css/tools/apiclient/.gitignore"])
 def test_gitignore_file(path):
+    path = os.path.join(*path.split("/"))
+
     expected_error = ("GITIGNORE",
                       ".gitignore found outside the root",
                       path,
@@ -93,6 +97,8 @@ def test_gitignore_file(path):
                                   "css/tools/apiclient/.gitignore",
                                   "css/tools/apiclient/elsewhere/.gitignore"])
 def test_gitignore_negative(path):
+    path = os.path.join(*path.split("/"))
+
     errors = check_path("/foo/", path)
 
     assert errors == []
diff --git a/tests/wpt/web-platform-tests/tools/manifest/XMLParser.py b/tests/wpt/web-platform-tests/tools/manifest/XMLParser.py
index 212bd7f32f4..8b4d5c7de1c 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/XMLParser.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/XMLParser.py
@@ -3,7 +3,7 @@ from os.path import dirname, join
 from collections import OrderedDict
 
 from xml.parsers import expat
-import xml.etree.ElementTree as etree
+import xml.etree.ElementTree as etree  # noqa: N813
 
 MYPY = False
 if MYPY:
diff --git a/tests/wpt/web-platform-tests/tools/manifest/item.py b/tests/wpt/web-platform-tests/tools/manifest/item.py
index f18e5ba6c9d..18c906b6d67 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/item.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/item.py
@@ -3,6 +3,8 @@ from six import iteritems
 from six.moves.urllib.parse import urljoin, urlparse
 from abc import ABCMeta, abstractproperty
 
+from .utils import to_os_path
+
 MYPY = False
 if MYPY:
     # MYPY is set to True when run under Mypy.
@@ -60,6 +62,7 @@ class ManifestItem(object):
 
     @classmethod
     def from_json(cls, manifest, path, obj):
+        path = to_os_path(path)
         return cls(manifest.tests_root, path)
 
 
@@ -96,6 +99,7 @@ class URLManifestItem(ManifestItem):
 
     @classmethod
     def from_json(cls, manifest, path, obj):
+        path = to_os_path(path)
         url, extras = obj
         return cls(manifest.tests_root,
                    path,
@@ -190,6 +194,7 @@ class RefTestBase(URLManifestItem):
 
     @classmethod
     def from_json(cls, manifest, path, obj):
+        path = to_os_path(path)
         url, references, extras = obj
         return cls(manifest.tests_root,
                    path,
diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py b/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
index 25944d5aca8..224999ab739 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
@@ -33,12 +33,7 @@ def rel_dir_file_path(draw):
         return "a"
     else:
         remaining = length - 2
-        if os.path.sep == "/":
-            alphabet = "a/"
-        elif os.path.sep == "\\":
-            alphabet = "a/\\"
-        else:
-            assert False, "uhhhh, this platform is weird"
+        alphabet = "a" + os.path.sep
         mid = draw(hs.text(alphabet=alphabet, min_size=remaining, max_size=remaining))
         return os.path.normcase("a" + mid + "a")
 
diff --git a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt b/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
index cc9098d218a..480aacd4662 100644
--- a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
+++ b/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
@@ -1,4 +1,4 @@
 flake8==3.7.7
 pycodestyle==2.5.0
 pyflakes==2.1.1
-pep8-naming==0.7.0
+pep8-naming==0.8.2
diff --git a/tests/wpt/web-platform-tests/tools/serve/test_functional.py b/tests/wpt/web-platform-tests/tools/serve/test_functional.py
index 60b950fc8aa..894479d111c 100644
--- a/tests/wpt/web-platform-tests/tools/serve/test_functional.py
+++ b/tests/wpt/web-platform-tests/tools/serve/test_functional.py
@@ -5,7 +5,8 @@ except ImportError:
 import json
 import os
 try:
-    import Queue as queue
+    # import Queue under its Python 3 name
+    import Queue as queue  # noqa: N813
 except ImportError:
     import queue
 import tempfile
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
index c173188379a..ff0adf17ac8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
@@ -3,6 +3,6 @@ mozinfo==1.1.0
 mozlog==4.0
 mozdebug==0.1.1
 pillow==6.0.0
-urllib3[secure]==1.24.2
+urllib3[secure]==1.25.2
 requests==2.22.0
 six>=1.8
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
index bd08a9cd5cf..1ffdda6003f 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
@@ -277,9 +277,8 @@ class TestSource(object):
         self.current_metadata = None
 
     @abstractmethod
-    # noqa: N805
-    #@classmethod (doesn't compose with @abstractmethod)
-    def make_queue(cls, tests, **kwargs):
+    #@classmethod (doesn't compose with @abstractmethod in < 3.3)
+    def make_queue(cls, tests, **kwargs):  # noqa: N805
         pass
 
     @classmethod
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_input_file.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_input_file.py
index b3f0fba48ab..98176e58386 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_input_file.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_input_file.py
@@ -2,6 +2,7 @@ import sys
 from io import BytesIO
 
 import pytest
+from six import PY2
 
 from wptserve.request import InputFile
 
@@ -120,7 +121,7 @@ def test_readlines():
     assert input_file.readlines() == test_file.readlines()
 
 
-@pytest.mark.xfail(sys.platform == "win32",
+@pytest.mark.xfail(sys.platform == "win32" and PY2,
                    reason="https://github.com/web-platform-tests/wpt/issues/12949")
 def test_readlines_file_bigger_than_buffer():
     old_max_buf = InputFile.max_buffer_size
@@ -139,7 +140,7 @@ def test_iter():
         assert a == b
 
 
-@pytest.mark.xfail(sys.platform == "win32",
+@pytest.mark.xfail(sys.platform == "win32" and PY2,
                    reason="https://github.com/web-platform-tests/wpt/issues/12949")
 def test_iter_file_bigger_than_buffer():
     old_max_buf = InputFile.max_buffer_size
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
index 86b4be6b129..bad4d624c9f 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
@@ -2,7 +2,6 @@ import os
 import unittest
 import time
 import json
-import sys
 
 from six.moves import urllib
 
@@ -61,8 +60,6 @@ class TestSub(TestUsingServer):
         expected = b"localhost localhost %i" % self.server.port
         self.assertEqual(resp.read().rstrip(), expected)
 
-    @pytest.mark.xfail(sys.platform == "win32",
-                       reason="https://github.com/web-platform-tests/wpt/issues/12949")
     def test_sub_file_hash(self):
         resp = self.request("/sub_file_hash.sub.txt")
         expected = b"""
@@ -83,8 +80,6 @@ sha512: r8eLGRTc7ZznZkFjeVLyo6/FyQdra9qmlYCwKKxm3kfQAswRS9+3HsYk3thLUhcFmmWhK4dX
         expected = b"PASS"
         self.assertEqual(resp.read().rstrip(), expected)
 
-    @pytest.mark.xfail(sys.platform == "win32",
-                       reason="https://github.com/web-platform-tests/wpt/issues/12949")
     def test_sub_location(self):
         resp = self.request("/sub_location.sub.txt?query_string")
         expected = """
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py
index 4813504a7e1..1ea99c0609f 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/test_stash.py
@@ -1,5 +1,6 @@
-import threading
 import multiprocessing
+import sys
+import threading
 from multiprocessing.managers import BaseManager
 
 import pytest
@@ -56,6 +57,8 @@ def run(process_queue, request_lock, response_lock):
     process_queue.put(thread_queue.get())
 
 
+@pytest.mark.xfail(sys.platform == "win32",
+                   reason="https://github.com/web-platform-tests/wpt/issues/16938")
 def test_delayed_lock(add_cleanup):
     """Ensure that delays in proxied Lock retrieval do not interfere with
     initialization in parallel threads."""
@@ -92,6 +95,9 @@ def test_delayed_lock(add_cleanup):
     assert [queue.get(), queue.get()] == [False, False], (
         "both instances had valid locks")
 
+
+@pytest.mark.xfail(sys.platform == "win32",
+                   reason="https://github.com/web-platform-tests/wpt/issues/16938")
 def test_delayed_dict(add_cleanup):
     """Ensure that delays in proxied `dict` retrieval do not interfere with
     initialization in parallel threads."""
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
index db188dad70a..3c5c1dc2378 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
@@ -6,7 +6,7 @@ import subprocess
 import tempfile
 from datetime import datetime, timedelta
 
-from six import iteritems
+from six import iteritems, PY2
 
 # Amount of time beyond the present to consider certificates "expired." This
 # allows certificates to be proactively re-generated in the "buffer" period
@@ -14,6 +14,17 @@ from six import iteritems
 CERT_EXPIRY_BUFFER = dict(hours=6)
 
 
+def _ensure_str(s, encoding):
+    """makes sure s is an instance of str, converting with encoding if needed"""
+    if isinstance(s, str):
+        return s
+
+    if PY2:
+        return s.encode(encoding)
+    else:
+        return s.decode(encoding)
+
+
 class OpenSSL(object):
     def __init__(self, logger, binary, base_path, conf_path, hosts, duration,
                  base_conf_path=None):
@@ -65,18 +76,14 @@ class OpenSSL(object):
             self.cmd += ["-config", self.conf_path]
         self.cmd += list(args)
 
-        # Copy the environment, converting to plain strings. Windows
-        # StartProcess is picky about all the keys/values being plain strings,
-        # but at least in MSYS shells, the os.environ dictionary can be mixed.
+        # Copy the environment, converting to plain strings. Win32 StartProcess
+        # is picky about all the keys/values being str (on both Py2/3).
         env = {}
         for k, v in iteritems(os.environ):
-            try:
-                env[k.encode("utf8")] = v.encode("utf8")
-            except UnicodeDecodeError:
-                pass
+            env[_ensure_str(k, "utf8")] = _ensure_str(v, "utf8")
 
         if self.base_conf_path is not None:
-            env["OPENSSL_CONF"] = self.base_conf_path.encode("utf8")
+            env["OPENSSL_CONF"] = _ensure_str(self.base_conf_path, "utf-8")
 
         self.proc = subprocess.Popen(self.cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
                                      env=env)
diff --git a/tests/wpt/web-platform-tests/url/historical.any.js b/tests/wpt/web-platform-tests/url/historical.any.js
index c3797ad2638..407e118f3a0 100644
--- a/tests/wpt/web-platform-tests/url/historical.any.js
+++ b/tests/wpt/web-platform-tests/url/historical.any.js
@@ -1,7 +1,9 @@
-test(function() {
-  assert_false("searchParams" in self.location,
-               "location object should not have a searchParams attribute");
-}, "searchParams on location object");
+if (self.location) {
+  test(function() {
+    assert_false("searchParams" in self.location,
+                "location object should not have a searchParams attribute");
+  }, "searchParams on location object");
+}
 
 if(self.GLOBAL.isWindow()) {
   test(() => {
diff --git a/tests/wpt/web-platform-tests/user-timing/performance-measure-invalid.worker.js b/tests/wpt/web-platform-tests/user-timing/performance-measure-invalid.worker.js
new file mode 100644
index 00000000000..dedd6da8884
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/performance-measure-invalid.worker.js
@@ -0,0 +1,9 @@
+importScripts("/resources/testharness.js");
+
+test(() => {
+  assert_throws(new TypeError(), () => {
+    performance.measure('name', 'navigationStart', 'navigationStart');
+  });
+}, "When converting 'navigationStart' to a timestamp, the global object has to be a Window object.");
+
+done();
diff --git a/tests/wpt/web-platform-tests/visual-viewport/helper-resize-event-on-load-overflowing-page.html b/tests/wpt/web-platform-tests/visual-viewport/helper-resize-event-on-load-overflowing-page.html
new file mode 100644
index 00000000000..c036b16ec87
--- /dev/null
+++ b/tests/wpt/web-platform-tests/visual-viewport/helper-resize-event-on-load-overflowing-page.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Viewport: Resize Event On Load Overflowing Page</title>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, minimum-scale=1">
+        <script>
+            var opener = window.opener;
+            var numViewResizes = 0;
+            window.visualViewport.addEventListener('resize', function() {
+                numViewResizes++;
+            });
+
+            window.addEventListener('load', function() {
+              requestAnimationFrame(function() {
+                requestAnimationFrame(
+                    opener.t.step_func_done(function() {
+                        var isOverlay = opener.calculateScrollbarThickness() == 0;
+                        opener.assert_equals(numViewResizes, isOverlay ? 0 : 1);
+                    }));
+                });
+            });
+        </script>
+        <style>
+          html {
+            height: 100%;
+          }
+          body {
+              /* Ensure overflow */
+              height: 200%;
+          }
+          #log {
+              overflow: auto;
+          }
+        </style>
+    </head>
+    <body>
+    <h1>Viewport: Resize Event On Load Overflowing Page</h1>
+    <h4>
+        Test Description: This test ensures that we fire a resize event against
+        window.visualViewport if the page has overflow (since this creates a scrollbar
+        and thus changes the viewport size).
+    </h4>
+    <div id="log"></div>
+    </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html b/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html
index c4b36879ad1..d5dc1deae72 100644
--- a/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html
+++ b/tests/wpt/web-platform-tests/visual-viewport/viewport-resize-event-on-load-overflowing-page.html
@@ -8,46 +8,16 @@
         <script src="/resources/testharnessreport.js"></script>
         <script src="viewport_support.js"></script>
         <script>
-            // This first case ensures that we load into the same kind of
-            // viewport. If the previous test had a page-scale factor set or a
-            // different viewport <meta> we might get a resize because of that.
-            if (location.search === "") {
-                window.addEventListener('load', function() {
-                    var url = window.location.href + "?reloaded";
-                    window.location.href = url;
-                });
-            } else {
-                var t = async_test(
-                    "Resize event fired exactly once against window.visualViewport if " +
-                    "scrollbars affect layout.");
-                var numViewResizes = 0;
-                window.visualViewport.addEventListener('resize', function() {
-                    numViewResizes++;
-                });
-
-                window.addEventListener('load', function() {
-                  requestAnimationFrame(function() {
-                    requestAnimationFrame(
-                        t.step_func_done(function() {
-                            var isOverlay = calculateScrollbarThickness() == 0;
-                            assert_equals(numViewResizes, isOverlay ? 0 : 1);
-                        }));
-                    });
-                });
-            }
+            var t = async_test(
+                "Resize event fired exactly once against window.visualViewport if " +
+                "scrollbars affect layout.");
+            t.step(() => {
+              // Run the test in a new window to make sure we don't pick up
+              // a resize event due to a previous page having a different scale.
+              var win = window.open("helper-resize-event-on-load-overflowing-page.html");
+              t.add_cleanup(() => win.close());
+            });
         </script>
-        <style>
-          html {
-            height: 100%;
-          }
-          body {
-              /* Ensure overflow */
-              height: 200%;
-          }
-          #log {
-              overflow: auto;
-          }
-        </style>
     </head>
     <body>
     <h1>Viewport: Resize Event On Load Overflowing Page</h1>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
index 01b4f112a0c..8264bcfd3fe 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animatable/getAnimations.html
@@ -41,6 +41,81 @@ test(t => {
   assert_array_equals(divChild.getAnimations(), [animationChild], 'divChild');
 }, 'Returns only the animations specific to each parent/child element');
 
+test(t => {
+  const divParent = createDiv(t);
+  const divChild = createDiv(t);
+  divParent.appendChild(divChild);
+  const divGrandChildA = createDiv(t);
+  const divGrandChildB = createDiv(t);
+  divChild.appendChild(divGrandChildA);
+  divChild.appendChild(divGrandChildB);
+
+  // Trigger the animations in a somewhat random order
+  const animGrandChildB = divGrandChildB.animate(null, 100 * MS_PER_SEC);
+  const animChild = divChild.animate(null, 100 * MS_PER_SEC);
+  const animGrandChildA = divGrandChildA.animate(null, 100 * MS_PER_SEC);
+
+  assert_array_equals(
+    divParent.getAnimations({ subtree: true }),
+    [animGrandChildB, animChild, animGrandChildA],
+    'Returns expected animations from parent'
+  );
+  assert_array_equals(
+    divChild.getAnimations({ subtree: true }),
+    [animGrandChildB, animChild, animGrandChildA],
+    'Returns expected animations from child'
+  );
+  assert_array_equals(
+    divGrandChildA.getAnimations({ subtree: true }),
+    [animGrandChildA],
+    'Returns expected animations from grandchild A'
+  );
+}, 'Returns animations on descendants when subtree: true is specified');
+
+test(t => {
+  createStyle(t, {
+    '@keyframes anim': '',
+    [`.pseudo::before`]: 'animation: anim 100s; ' + "content: '';",
+  });
+  const div = createDiv(t);
+  div.classList.add('pseudo');
+
+  assert_equals(
+    div.getAnimations().length,
+    0,
+    'Returns no animations when subtree is false'
+  );
+  assert_equals(
+    div.getAnimations({ subtree: true }).length,
+    1,
+    'Returns one animation when subtree is true'
+  );
+}, 'Returns animations on pseudo-elements when subtree: true is specified');
+
+test(t => {
+  const host = createDiv(t);
+  const shadow = host.attachShadow({ mode: 'open' });
+
+  const elem = createDiv(t);
+  shadow.appendChild(elem);
+
+  const elemChild = createDiv(t);
+  elem.appendChild(elemChild);
+
+  elemChild.animate(null, 100 * MS_PER_SEC);
+
+  assert_equals(
+    host.getAnimations({ subtree: true }).length,
+    0,
+    'Returns no animations with subtree:true when called on the host'
+  );
+  assert_equals(
+    elem.getAnimations({ subtree: true }).length,
+    1,
+    'Returns one animation when called on a parent in the shadow tree'
+  );
+}, 'Does NOT cross shadow-tree boundaries when subtree: true is specified');
+
 test(t => {
   const foreignElement
     = document.createElementNS('http://example.org/test', 'test');
diff --git a/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html b/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html
index d53e5023a1b..5badeb40838 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NFCWriter_push.https.html
@@ -228,8 +228,7 @@ promise_test(t => {
       promise_rejects(t, new TypeError(), writer.push({
         url: invalid_url,
         records: [{ recordType: "text", data: 'Hello World' }]
-      }));
-    );
+      })));
   });
   return Promise.all(promises);
 }, "Test that promise is rejected with TypeError if NDEFMessageSource contains non-string url.");
@@ -242,8 +241,7 @@ promise_test(t => {
       promise_rejects(t, new TypeError(), writer.push({
         serialNumber: invalid_serialNumber,
         records: [{ recordType: "text", data: 'Hello World' }]
-      }));
-    );
+      })));
   });
   return Promise.all(promises);
 }, "Test that promise is rejected with TypeError if NDEFMessageSource contains non-string serialNumber.");
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
index 5426e581073..986204df8b7 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
@@ -245,6 +245,22 @@ async function doSignalingHandshake(localPc, remotePc, options={}) {
   await remotePc.setLocalDescription(answer);
 }
 
+// Returns a promise that resolves when the |transport| gets a
+// 'statechange' event with the value |state|.
+// This should work for RTCSctpTransport, RTCDtlsTransport and RTCIceTransport.
+function waitForState(transport, state) {
+  return new Promise((resolve, reject) => {
+    const eventHandler = () => {
+      if (transport.state == state) {
+        transport.removeEventListener('statechange', eventHandler, false);
+        resolve();
+      }
+    };
+    transport.addEventListener('statechange', eventHandler, false);
+  });
+}
+
+
 // Returns a promise that resolves when |pc.iceConnectionState| is 'connected'
 // or 'completed'.
 function listenToIceConnected(pc) {
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
index 82ce3bd8467..a78ede0d908 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
@@ -41,6 +41,15 @@ for (const kind of ['audio', 'video']) {
     assert_true(ssrc.timestamp >= startTime);
   }, '[' + kind + '] RTCRtpSynchronizationSource.timestamp is a number');
 
+  promise_test(async t => {
+    const receiver = await initiateSingleTrackCallAndReturnReceiver(t, kind);
+    const [ssrc] = await listenForSSRCs(t, receiver);
+    assert_equals(typeof ssrc.rtpTimestamp, 'number');
+    assert_greater_than_equal(ssrc.rtpTimestamp, 0);
+    assert_less_than_equal(ssrc.rtpTimestamp, 0xffffffff);
+  }, '[' + kind + '] RTCRtpSynchronizationSource.rtpTimestamp is a number ' +
+     '[0, 2^32-1]');
+
   promise_test(async t => {
     const receiver = await initiateSingleTrackCallAndReturnReceiver(t, kind);
     // Wait for packets to start flowing.
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html b/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html
index 777ac252bc1..dc4ea7bde13 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html
@@ -7,18 +7,6 @@
 <script>
 'use strict';
 
-function waitForState(transport, state) {
-  return new Promise((resolve, reject) => {
-    const eventHandler = () => {
-      if (transport.state == state) {
-        transport.removeEventListener('statechange', eventHandler, false);
-        resolve();
-      }
-    };
-    transport.addEventListener('statechange', eventHandler, false);
-  });
-}
-
 promise_test(async t => {
   const pc1 = new RTCPeerConnection();
   t.add_cleanup(() => pc1.close());
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-maxChannels.html b/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-maxChannels.html
new file mode 100644
index 00000000000..e62404a21a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-maxChannels.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>RTCSctpTransport.prototype.maxChannels</title>
+<link rel="help" href="https://w3c.github.io/webrtc-pc/#rtcsctptransport-interface">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="RTCPeerConnection-helper.js"></script>
+<script>
+'use strict';
+
+promise_test(async (t) => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+
+  assert_equals(pc.sctp, null, 'RTCSctpTransport must be null');
+  pc.createDataChannel('test');
+  const offer = await pc.createOffer();
+  await pc.setRemoteDescription(offer);
+  const answer = await pc.createAnswer();
+  await pc.setLocalDescription(answer);
+
+  assert_not_equals(pc.sctp, null, 'RTCSctpTransport must be available');
+  assert_equals(pc.sctp.maxChannels, null, 'maxChannels must not be set');
+}, 'An unconnected peerconnection must not have maxChannels set');
+
+promise_test(async (t) => {
+    const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+  coupleIceCandidates(pc1, pc2);
+  pc1.createDataChannel('');
+  const offer = await pc1.createOffer();
+  await pc1.setLocalDescription(offer);
+  const pc1ConnectedWaiter = waitForState(pc1.sctp, 'connected');
+  await pc2.setRemoteDescription(offer);
+  const pc2ConnectedWaiter = waitForState(pc2.sctp, 'connected');
+  const answer = await pc2.createAnswer();
+  await pc2.setLocalDescription(answer);
+  await pc1.setRemoteDescription(answer);
+  assert_equals(null, pc1.sctp.maxChannels);
+  assert_equals(null, pc2.sctp.maxChannels);
+  await pc1ConnectedWaiter;
+  await pc2ConnectedWaiter;
+  assert_not_equals(null, pc1.sctp.maxChannels);
+  assert_not_equals(null, pc2.sctp.maxChannels);
+  assert_equals(pc1.sctp.maxChannels, pc2.sctp.maxChannels);
+}, 'maxChannels gets instantiated after connecting');
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/candidate-exchange.https.html b/tests/wpt/web-platform-tests/webrtc/protocol/candidate-exchange.https.html
new file mode 100644
index 00000000000..2603a02cddf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/candidate-exchange.https.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Candidate exchange</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../RTCPeerConnection-helper.js"></script>
+</head>
+<body>
+<script>
+
+function iceGatheringCompleteWaiter(pc) {
+  const waiter = new Promise((resolve) => {
+    const eventHandler = () => {
+      if (pc.iceGatheringState == 'complete') {
+        pc.removeEventListener('icegatheringstatechange', eventHandler, false);
+        resolve();
+      }
+    };
+    if (pc.iceGatheringState == 'complete') {
+      resolve();
+    } else {
+      pc.addEventListener('icegatheringstatechange', eventHandler, false);
+    }
+  });
+  return waiter;
+}
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  t.add_cleanup(() => pc2.close());
+  pc1.createDataChannel('datachannel');
+  coupleIceCandidates(pc1, pc2);
+  await doSignalingHandshake(pc1, pc2);
+  await waitForIceStateChange(pc1, ['connected', 'completed']);
+}, 'Two way ICE exchange works');
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  t.add_cleanup(() => pc2.close());
+  let candidates = [];
+  pc1.createDataChannel('datachannel');
+  pc1.onicecandidate = e => {
+    candidates.push(e.candidate);
+  }
+  // Candidates from PC2 are not delivered to pc1, so pc1 will use
+  // peer-reflexive candidates.
+  await doSignalingHandshake(pc1, pc2);
+  const waiter = iceGatheringCompleteWaiter(pc1);
+  await waiter;
+  for (const candidate of candidates) {
+    if (candidate) {
+      pc2.addIceCandidate(candidate);
+    }
+  }
+  await Promise.all([waitForIceStateChange(pc1, ['connected', 'completed']),
+                     waitForIceStateChange(pc2, ['connected', 'completed'])]);
+  const candidate_pair = pc1.sctp.transport.iceTransport.getSelectedCandidatePair();
+  assert_equals(candidate_pair.local.type, 'host');
+  assert_equals(candidate_pair.remote.type, 'prflx');
+}, 'Adding only caller -> callee candidates gives a connection');
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  t.add_cleanup(() => pc2.close());
+  let candidates = [];
+  pc1.createDataChannel('datachannel');
+  pc2.onicecandidate = e => {
+    candidates.push(e.candidate);
+  }
+  // Candidates from pc1 are not delivered to pc2.  so pc2 will use
+  // peer-reflexive candidates.
+  await doSignalingHandshake(pc1, pc2);
+  const waiter = iceGatheringCompleteWaiter(pc2);
+  await waiter;
+  for (const candidate of candidates) {
+    if (candidate) {
+      pc1.addIceCandidate(candidate);
+    }
+  }
+  await Promise.all([waitForIceStateChange(pc1, ['connected', 'completed']),
+                     waitForIceStateChange(pc2, ['connected', 'completed'])]);
+  const candidate_pair = pc2.sctp.transport.iceTransport.getSelectedCandidatePair();
+  assert_equals(candidate_pair.local.type, 'host');
+  assert_equals(candidate_pair.remote.type, 'prflx');
+}, 'Adding only callee -> caller candidates gives a connection');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/ice-state.https.html b/tests/wpt/web-platform-tests/webrtc/protocol/ice-state.https.html
index 99d2a25eede..4a6b4333e16 100644
--- a/tests/wpt/web-platform-tests/webrtc/protocol/ice-state.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/ice-state.https.html
@@ -94,8 +94,8 @@ promise_test(async t => {
   const sender = pc1.addTrack(track);
   exchangeIceCandidates(pc1, pc2);
   await doSignalingHandshake(pc1, pc2);
-  await waitForIceStateChange(pc1, ['connected']);
-}, 'PC should enter connected state when candidates are sent');
+  await waitForIceStateChange(pc1, ['connected', 'completed']);
+}, 'PC should enter connected (or completed) state when candidates are sent');
 
 promise_test(async t => {
   const pc1 = new RTCPeerConnection();
diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html b/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
index e3dd77be72a..243fb8cd666 100644
--- a/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrFrame_getPose.https.html
@@ -26,8 +26,8 @@ let testFunction = function(session, fakeDeviceController, t) {
     }]);
 
   return Promise.all([
-    session.requestReferenceSpace({ type: "stationary", subtype: "eye-level" }),
-    session.requestReferenceSpace({ type: "stationary", subtype: "eye-level" })
+    session.requestReferenceSpace('local'),
+    session.requestReferenceSpace('local')
   ]).then((spaces) => new Promise((resolve) => {
     function onFrame(time, xrFrame) {
       const radians = Math.PI / 2.0; // 90 degrees
diff --git a/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html b/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html
index b924c89771e..27ef02de337 100644
--- a/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrFrame_lifetime.https.html
@@ -16,6 +16,7 @@
     let testFunction = (testSession, testController, t) => new Promise((resolve) => {
       let staleFrame = null;
       let currentReferenceSpace = null;
+      let currentViewerSpace = null;
 
       function onFrame(time, xrFrame) {
         t.step(() => {
@@ -31,16 +32,19 @@
           // Attempting to call a method on the frame outside the callback that
           // originally provided it should cause it to throw an exception.
           assert_throws('InvalidStateError', () => staleFrame.getViewerPose(currentReferenceSpace));
-          assert_throws('InvalidStateError', () => staleFrame.getPose(testSession.viewerSpace, currentReferenceSpace));
+          assert_throws('InvalidStateError', () => staleFrame.getPose(currentViewerSpace, currentReferenceSpace));
         });
 
         // Test does not complete until the this function has executed.
         resolve();
       }
 
-      testSession.requestReferenceSpace({ type: 'stationary', subtype: 'eye-level' }).then((referenceSpace) => {
-        currentReferenceSpace = referenceSpace;
-        testSession.requestAnimationFrame(onFrame);
+      testSession.requestReferenceSpace('viewer').then((viewerSpace) => {
+        currentViewerSpace = viewerSpace;
+        testSession.requestReferenceSpace('local').then((referenceSpace) => {
+          currentReferenceSpace = referenceSpace;
+          testSession.requestAnimationFrame(onFrame);
+        });
       });
     });
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html
index 44e903e4fb9..c5108e4eccf 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_data_valid.https.html
@@ -43,7 +43,7 @@
 
     let testFunction = function(session, testDeviceController) {
       testSession = session;
-      return session.requestReferenceSpace({ type: 'stationary', subtype: 'eye-level' })
+      return session.requestReferenceSpace('local')
         .then((referenceSpace) => new Promise((resolve) => {
 
           function onFrame(time, xrFrame) {
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
index 5606fa1ab12..95d9e781059 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html
@@ -20,7 +20,7 @@
     const validViewMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 4, 3, 2, 1];
 
     let testFunction = function(session, fakeDeviceController, t) {
-      return session.requestReferenceSpace({ type: 'stationary', subtype: 'eye-level' })
+      return session.requestReferenceSpace('local')
         .then((referenceSpace) => new Promise((resolve, reject) => {
           let counter = 0;
           function onFrame(time, vrFrame) {
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
index 0027d5dce01..2fbf9b977ca 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_requestReferenceSpace.https.html
@@ -14,11 +14,9 @@
     let fakeDeviceInitParams = { supportsImmersive: true };
 
     let testFunction = function(session, fakeDeviceController, t) {
-      return promise_rejects(t, new TypeError(), session.requestReferenceSpace({ type: "foo" }))
-        .then(() => promise_rejects(t, "NotSupportedError", session.requestReferenceSpace({ type: "stationary" })))
-        .then(() => promise_rejects(t, new TypeError(), session.requestReferenceSpace({ type: "stationary", subtype: "bar" })))
+      return promise_rejects(t, new TypeError(), session.requestReferenceSpace('foo'))
         .then(() => Promise.all([
-        session.requestReferenceSpace({ type: "identity" }).then( (referenceSpace) => {
+        session.requestReferenceSpace('viewer').then( (referenceSpace) => {
             t.step(() => {
               assert_true(referenceSpace instanceof XRSpace,
                 "identity reference space is not correct type.");
@@ -26,47 +24,33 @@
                 "identity reference space is not correct type.");
             });
           }),
-          session.requestReferenceSpace({ type: "stationary", subtype: "position-disabled" }).then( (referenceSpace) => {
-            t.step(() => {
-              assert_true(referenceSpace instanceof XRSpace,
-                "position-disabled stationary reference space is not correct type.");
-              assert_true(referenceSpace instanceof XRReferenceSpace,
-                "position-disabled stationary reference space is not correct type.");
-              assert_true(referenceSpace instanceof XRStationaryReferenceSpace,
-                "position-disabled stationary reference space is not correct type.");
-            });
-          }),
-          session.requestReferenceSpace({ type: "stationary", subtype: "eye-level" }).then( (referenceSpace) => {
+          session.requestReferenceSpace('local').then( (referenceSpace) => {
             t.step(() => {
               assert_true(referenceSpace instanceof XRSpace,
                 "eye-level stationary reference space is not correct type.");
               assert_true(referenceSpace instanceof XRReferenceSpace,
                 "eye-level stationary reference space is not correct type.");
-              assert_true(referenceSpace instanceof XRStationaryReferenceSpace,
-                "eye-level stationary reference space is not correct type.");
             });
           }),
-          session.requestReferenceSpace({ type: "stationary", subtype: "floor-level" }).then( (referenceSpace) => {
+          session.requestReferenceSpace('local-floor').then( (referenceSpace) => {
             t.step(() => {
               assert_true(referenceSpace instanceof XRSpace,
                 "floor-level stationary reference space is not correct type.");
               assert_true(referenceSpace instanceof XRReferenceSpace,
                 "floor-level stationary reference space is not correct type.");
-              assert_true(referenceSpace instanceof XRStationaryReferenceSpace,
-                "floor-level stationary reference space is not correct type.");
             });
           })
         ]))
         .then(() => {
           if (!session.immersive) {
             // Bounded reference spaces are not allowed in inline sessions.
-            return promise_rejects(t, "NotSupportedError", session.requestReferenceSpace({ type: "bounded" }))
+            return promise_rejects(t, "NotSupportedError", session.requestReferenceSpace('bounded-floor'))
           }
         })
         .then(() => {
           if (!session.immersive) {
             // Unbounded reference spaces are not allowed in inline sessions.
-            return promise_rejects(t, "NotSupportedError", session.requestReferenceSpace({ type: "unbounded" }))
+            return promise_rejects(t, "NotSupportedError", session.requestReferenceSpace('unbounded'))
           }
         })
     };
diff --git a/tests/wpt/web-platform-tests/webxr/xrSession_identity_referenceSpace.https.html b/tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html
similarity index 97%
rename from tests/wpt/web-platform-tests/webxr/xrSession_identity_referenceSpace.https.html
rename to tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html
index 07abc39728c..85e5e87f826 100644
--- a/tests/wpt/web-platform-tests/webxr/xrSession_identity_referenceSpace.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrSession_viewer_referenceSpace.https.html
@@ -22,7 +22,7 @@
     const validViewMatrix = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 4, 3, 2, 1];
 
     let testFunction = function(session, fakeDeviceController, t) {
-      return session.requestReferenceSpace({ type: 'identity' })
+      return session.requestReferenceSpace('viewer')
         .then((referenceSpace) => new Promise((resolve, reject) => {
           let counter = 0;
           function onFrame(time, xrFrame) {
diff --git a/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html b/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html
index 847ba388a70..8090bcebadb 100644
--- a/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrView_eyes.https.html
@@ -25,7 +25,7 @@ let testFunction = function(session, fakeDeviceController, t) {
       viewMatrix: VALID_VIEW_MATRIX
     }]);
 
-  return session.requestReferenceSpace({ type: "identity" })
+  return session.requestReferenceSpace('viewer')
       .then((space) => new Promise((resolve) => {
     function onFrame(time, xrFrame) {
       let viewer_pose = xrFrame.getViewerPose(space);
diff --git a/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html b/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html
index 9efbc320946..ede54468259 100644
--- a/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html
+++ b/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html
@@ -19,7 +19,8 @@
 
   async_test(t => {
     var i = document.createElement('iframe');
-    i.src = "./support/nested.py?origin=http://{{host}}:{{ports[http][0]}}&value=SAMEORIGIN";
+    i.src =
+      "./support/nested.py?origin=http://{{host}}:{{ports[http][0]}}&value=SAMEORIGIN&loadShouldSucceed=true";
 
     wait_for_message_from(i, t)
       .then(t.step_func_done(e => {
diff --git a/tests/wpt/web-platform-tests/x-frame-options/support/nested.py b/tests/wpt/web-platform-tests/x-frame-options/support/nested.py
index c7dca4aeee5..e640f37a230 100644
--- a/tests/wpt/web-platform-tests/x-frame-options/support/nested.py
+++ b/tests/wpt/web-platform-tests/x-frame-options/support/nested.py
@@ -1,6 +1,8 @@
 def main(request, response):
     origin = request.GET.first("origin");
     value = request.GET.first("value");
+    # This is used to solve the race condition we have for postMessages
+    shouldSucceed = request.GET.first("loadShouldSucceed", "false");
     return ([("Content-Type", "text/html")],
             """<!DOCTYPE html>
 <title>XFO.</title>
@@ -19,7 +21,13 @@ def main(request, response):
     // load event from racing with the onmessage event.
     requestAnimationFrame(_ => {
       requestAnimationFrame(_ => {
-        if (!gotMessage) {
+        // The race condition problem we have is it is possible
+        // that the sub iframe is loaded before the postMessage is
+        // dispatched, as a result, the "Failed" message is sent
+        // out. So the way we fixed is we simply let the timeout
+        // to happen if we expect the "Loaded" postMessage to be
+        // sent
+        if (!gotMessage && %s != true) {
           window.parent.postMessage("Failed", "*");
         }
       });
@@ -27,5 +35,5 @@ def main(request, response):
   };
   document.body.appendChild(i);
 </script>
-            """ % (origin, value))
+            """ % (origin, value, shouldSucceed))