diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini
index cfa0a3a8266..7e5a2cb921a 100644
--- a/tests/wpt/include.ini
+++ b/tests/wpt/include.ini
@@ -3,8 +3,6 @@ skip: true
   skip: false
   [mozilla]
     skip: false
-    [referrer-policy]
-      skip: true
 [_webgl]
   skip: false
 [2dcontext]
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 16cb02a6068..22b998a54ce 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -10385,1266 +10385,6 @@
      {}
     ]
    ],
-   "mozilla/referrer-policy/OWNERS": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/README.md": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/common.js": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/referrer-policy-test-case.js": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/sanity-checker.js": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/subresource/__init__.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/subresource/a-tag.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/subresource/a-tag.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/subresource/document.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/subresource/link.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/subresource/mozresource.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/subresource/stash.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/css.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/disclaimer.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/document.html.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/script.js.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/spec_json.js.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/test.debug.html.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/test.js.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/test.release.html.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/test_description.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/template/worker.js.template": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/tools/__init__.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/tools/clean.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/tools/common_paths.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/tools/generate.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/tools/regenerate": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/generic/tools/spec_validator.py": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/spec.src.json": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/spec_json.js": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-    [
-     {}
-    ]
-   ],
    "mozilla/remove_link_styles.css": [
     [
      {}
@@ -14310,6342 +13050,6 @@
      {}
     ]
    ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html",
-     {}
-    ]
-   ],
-   "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-    [
-     "/_mozilla/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html",
-     {}
-    ]
-   ],
    "mozilla/response-data-brotli.htm": [
     [
      "/_mozilla/mozilla/response-data-brotli.htm",
@@ -27289,5238 +19693,6 @@
    "4fd4ddc8b1a9959e90b243795267c220d6a05f5e",
    "testharness"
   ],
-  "mozilla/referrer-policy/OWNERS": [
-   "db2d613c22614f458bef6b6fe357f765bf289506",
-   "support"
-  ],
-  "mozilla/referrer-policy/README.md": [
-   "9d139c8e71d82d4253975e20bb313124173c452f",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/common.js": [
-   "6adf59c0c29d839b39212e37f3260fd1c0862f80",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/referrer-policy-test-case.js": [
-   "2d676c40b23481dc20795cb2cbee2ef1ea08f553",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/sanity-checker.js": [
-   "e0714885ffcc9d13bf2acb8e60634a2dd62170dc",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/subresource/__init__.py": [
-   "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/subresource/a-tag.html": [
-   "8f8b8da64973a35574a2c728b56fcb305698ad40",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/subresource/a-tag.py": [
-   "24330e4f3c2d7b15284607dad364af14e1948942",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/subresource/document.py": [
-   "0c627780dd8a185387fe1a0b8a73235517655f70",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/subresource/link.py": [
-   "362e78bd4bfdec4cb1727b5c540a091ab460e0f1",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/subresource/mozresource.py": [
-   "763062ce52c5e133acad5218c4d426171a6a677e",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/subresource/stash.py": [
-   "9be57acbdaddaa72007154136234d852c3ef819c",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/css.template": [
-   "30021bc8130d918570ab38c675d47334f627abbf",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/disclaimer.template": [
-   "66c43ed6f21324d44b1596c09a02fecf53f41323",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/document.html.template": [
-   "fa2baa63cf80efb44cae5e4c1f03f2dbcd92e57b",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/script.js.template": [
-   "e2edf21819dff6afc8a4f5816a0be58f987341ff",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/spec_json.js.template": [
-   "e4cbd03425968819d773460335404584d9d375fc",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/test.debug.html.template": [
-   "a92e460e93443737bf89a0f045d2c0e9ac476136",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/test.js.template": [
-   "4b01d4d113a8d3a2e8313dc822b8f8dcad21c5f5",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/test.release.html.template": [
-   "b2523fb045dc7837bce786465f5c0595df002669",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/test_description.template": [
-   "fbc80bb25af678657dc5f417bb9a930496ca4875",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/template/worker.js.template": [
-   "817dd8c87ac81e1a13bbee7691d69fb2a021f527",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/tools/__init__.py": [
-   "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/tools/clean.py": [
-   "715e1d6ae4b53461a99b3789a5200e4cb6456f4c",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/tools/common_paths.py": [
-   "4626223c4c56e2cc661e8e888e2aed192e41affb",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/tools/generate.py": [
-   "627133bf6bc6df512f432160743cfc3029a4e5ce",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/tools/regenerate": [
-   "e6bd63519b331b3a921755445f6895e39f7864f5",
-   "support"
-  ],
-  "mozilla/referrer-policy/generic/tools/spec_validator.py": [
-   "8641bbc1f1653e70bf21b0e803d4212fb957af16",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "83bf807c0cd37c2775d7bc375ac2558c96edf8ba",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "cee768b4d3f5731bc4e4bf06e9baa6d1d8b3b5d3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "09ecf5a98f31067f126773276ed12af87ec174be",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "27ddbe14cd9b6d09a67cbb87fd7e5c7d85285ec0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "72059f8b29b01e5095a209cc67ce2410502efee4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "26322f75e9f67b024306398ca07bc8dd38de9a52",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "1fe16bd3fc1ff773605d25b0a74e2feb8deca0d8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "8f02ff3921ad82caa95c125db98597659cda5c29",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "e532c627e5be4d8e1ab04b0bb3a7335855991516",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "a9dc72117a5e74625e3f9defa2c0e32e39da4498",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "1750d9a09bc0e44769ac46f809d5897143334111",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "f2cd6e01066ca5e145a528d0c8d06c1226cac2f9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "0214509d27b24d642204e5653cd5ca10f72c3b17",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "fe01beca1022e86f913c95cd4aa0b88b0764d1f8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "249583c8ccfdd4500ed5225814fd033a95793026",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "f809976cae5b1b7679fae1ae561929c9c26e19bb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "22661eec35c382f2a028241b7b36e8205d0ec6bf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "755425577a7614b4feefc3b7abaee2ad95f0aa67",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "eaa02ad2983e7d9c6bf869bf0d7c78c56e17f47c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "4ae39d55784dae9272e8aa35346d0de0407025a1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "c9864a5a1ee4360122d3ed111165082a1637743b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "db8ef405daa0145d0b2d4f8e8e23b912f3e6985f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "cc4437740f791f309fb89d1e24be536310ba16e4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "3d9d116ef4282a903b60f0f25844b5722660689c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "8e2efeb10cf8c0d25ded805cc6aebd3c1292958a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "3335a72e71cd7ebd34bb5d894a86e3662be60405",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "ab03444f9b77d4dcea7417fa84815998e104bdcc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "e81fc8826efc55db9e60d9c8a36daa03f4ebbade",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "e6bdd25216198b36a211357ef6ea6fd98e570934",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "19a2fe065823259e1d22155221952a59a965eb38",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "a80dd7f2850b5371036bef757e56c6af50a9dc56",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "1221154f79fcff84480105d13285d5c8be444096",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "eac9f15e15828584c9325cfc8eff0267b4900d19",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "0a825e7fba13c1ed3ce2d22e1490036160933cb0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "3cb001bf5d53e278f932f7ec6a7431db386a20c8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "c0bdf6d9899ef2e0efa41363cbd22292d4d81439",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "cfa06807b362dee220f82e4777ba33594da3f73d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "324884e8c3dc283d6a9d1eaa9b0800a92f30c0e7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "07780241974a7bed6cdadb149c90d90469f3226d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "01a946be353eab8d0ed215fed65b8d3ddc5dcdbf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "ff442044fc445ba0f37dd62ca1e303ffe960293f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "890bd45e038250a599addaafbdfa0d8eae535820",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "adb2c9dd25be3c35ae5523e85b6e42604ccf9cbc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "3bd097e1f8a819d454058ed90d9e86d25612e96f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "3b50585996e82493fb06ff14779a96b9730f817f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "ab8d6bbe7dd9764e105ec4a5ea66a8a78e235d41",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "2c2ab524a341888c179cf34a402d7af1d8fec639",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "f37ebb1e83e0f1a058a886cb2ef530cb6eb805f7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "850f68df4bc07723863890b6862bd61656cd6eb7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "9605a483c607bb33dcf5f02d07f67b2f75e1765f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "ce77bfdac5de3ffcd32a7a98346a3089fd477d3d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "d2cbca0c187a699cf71aa79178245c91cbdbc2d4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "5ea855747193cfb1820076fe3527c7a16839100b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "6feb8e25d7cb3f45d1e9c726a3bbaf5ad4e242f4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "32672ff58106e2c4f3ddc6c2c9552ba2b165840e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "68eafc865952c5ee49973d9256afff61ad2f02c3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "8f45b4cc4e5edca4bb5f5fd2e21b2fc36f51406c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "ac808dd6df331dad014aa12578b652d47e215594",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "ebdd25b0abb625b9bed92a99f084cd0ff7a7bd43",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "a8ba4b2f2365593c4b5785cf7fa8ac7a9cd3a21c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "36a5dcdfa4d92446eddd5d988a1ba96579fa3e90",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "f8558f488a65df5167fa13c5e0038a5f4f9a959d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "ffbda4f21dbb17a74fc52c41a1e1d3d7e896034f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "e2ec69874003c298ab54e854848d75713b061d8c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "8592006300091afc6b537674d6ce299df4fe57c4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "d7110749891623a534c821be6e4f33e99b73c250",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "e87c84ec0dad9ae936705ca04f858cb056ccac9f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "7c5ef9383a62705a36bea2683733f33db961008e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "fd55d3a6a075948d04fcff905d13a8cf11245dc1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "550eee944f2aece317cf91f6d919357a959c83d6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "a89179ba4548246915dda6a7e563619457743237",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "1ed25cc30c8a9c22cfa227a33c0b6aef0d2334f1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers": [
-   "f2152da955f3295aec2ac05adc2357ac7629cf7b",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "a2b065d6b269c3e9a059f4279b1f7eb82b0375b8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "72af59fd8299f622839a3a821e5529cacacff8a7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "d593b58fe40a6b2e26975b949c86fffbd2034bbd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "33267880b678c3bbdc6ad19fd811944eb25f05c2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "5eb3618345d854ed4f41029de6cc3dfdcfb838a3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "147e3b91a9380f234d3ceb2195ad597221d528b6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "cde014b2863b75b4869d0ba30105c1f806439db0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "8ea3b75d95b56cb76fffbd3601f887b1dda28a33",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "f5813e5c39feacb0806b7bbd059876bc08eea47a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "c837d1c0f10681d5ec72bbe73bc4bca63456ef28",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "c999da57203f29293674524a94a8656b9892f306",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "246f9e80b230512ffa4338d148b2a8bd85220945",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "2763a8f87dc3d5ec83bd678546e526ffa94e876a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "507a43f7e39319cabc52de17ab55d322902861a2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "9ca934c543551c52027de68ba774a62ed42fd909",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "5b5524efe5044768f5f4aebf41b2a0aa4d31f42f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "7fcaf289293bb3181cd1c6828227552a418fd1f5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "faba80d85198566440aa05330ef67e9e926b2fb0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "e44c3596a0db6711c691d51c72b1309795392dd1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "9f8dc97322ab7b63eafe4ed4406c3e06386b15a6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "06bd9ef1c9db626e4d360b901539f6c0c4b023ce",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "bf25ce542b2145eaada10b9e5b14cf2790a9db52",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "3a178db8d0b31615511b9ebc256a30d19d1498d3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "9761abdcc49ea667dc9c49a032bc88f5484efb88",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "ee3b88828e7462d5813e1c8ee9c76fcf5dc19e7c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "11cdafe5682eb04f9e7dc6f3b6d60dbd0ef5a7a5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "86f0dea9ef3fe8f334e1175ddc83eac1a995a489",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "8d8f78563ab7309bee1d5ab3913de6badf83aa39",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "7b15091b0013e22cc0bdb438303d3a39f78c3aaa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "e93c7ad539bc72ef98c60b8257939d4afafe707c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "593552134e37fb2e4e612f3db765d1cae7418091",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "6b246ffb5d72e1fea12173b04b45f754ac2a8485",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "1626df0349ed6b1310cd5ce2840cb6ef64f95ab1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "8ae9694934770b24f181fd93146b232588f7c735",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "30b76fc541a95b4ec3c6e0e31a6b9739245c8d7e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "98f0a3dd3ee7595f8c837c8cb14a64ffbd6c0ff5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "279994960afee51ee3a34dfc462f9aa0ee31def3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "9c389b696a6cebaa7da362720a235a6eaa956ac9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "c15cb2e7ccde2a80a1ec67d782d522197e4ed4cb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "9807e217061d9b9b4aa7e314c47fea8af02c1a02",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "ca120d93477c1adf97198e264ca6f5a55f43078d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "0a2b8becbdcd3524516b0a92107901400237612d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "6ab8a2936376c77921dcd27600c321a4bac1e928",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "071b763a016b85e97ae729cacac3fa405658ca80",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "576afe6face2eb53439a6652909e6365e89751e6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "8fc3c1025d7834368704960ed67fbe97f3bb343e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "27aa02f70925987b7dc2ee2d1ca8f1fd8ca29d7f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "42c11cd548d585df58126763549ccb4a130c2b56",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "de0af0598736b41c64dfb4a9c394398d5d7803b4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "99c24a45106653087518b88d5b79e7731ff34564",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "afa999806ed3cc2c54cd018d25fb0cdca07976a8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "18ed8c2a184d20b41b29e148aca981cc30eecdd6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "45da44217d372ad5aa5404d273652558d07175bf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "c46ebbf18c7dc41ca0aeb91021fa54d4e75bc407",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "94172e0932d27764e3e53b9a7e16046fc46d8c06",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "0caa9038f715580ce055c9636d9bf6290bd47914",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "1a5d0d016a49760be34cc79deff1141ebb2b01bd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "a52353d51e9cd9ef59eed7bed80bf885afdb5cba",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "2e03e034f77b89a944896e0ecb8ec5a6ede94841",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "8352b8e96a49b7f25912c0fd612e5b7cab0535e6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "44b84e129cbf8622a5601fc23e5e2c86bc6a6ede",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "93281743059f6aa8febb13c81371fda7f0a82f47",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "efb6b0930df5dfd04f403a85b8a5f5e2e2dc385d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "df2c221cf75f7a4551448c70ed6c108fb1f2acab",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "fbde8afaf27bb0171a83893e1fafd5ffdb23cc06",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "5a7cadef302579e131597b40e27afdc59d903998",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "49b5996c0f92c2ed124687d1cdd99c8c41320aab",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "d3e8e2bf66a0a60ee2665dc961c931c4aab1089d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "5bc9df06330c66673ced4bf2bb35e9ca8c2c69fa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "24a2a24752ce1fdd7c45844a12cf6c9fc4ff6881",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "e35010b0dcb189d5199c0d9bb4065c0a8e82964d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "8e446c5de5a457f3f0363bcd32cc5dcfdbd33f29",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "77e5e8d48a3d54946b6e5b2fc2cbd785091baf09",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "3ad89e9922bced4650f1653b954097ccfc78a906",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "83da898bf3c74fdc4ec1688a955194724542c985",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "d45aaba6977f9aaa3d74f5a6c6164801a3db4a2d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "287685b5ab417103af3b6b19083f93a7eaf76166",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "5abf46c7980b74e08a9a9036d7101dfa96ada6dc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "fc80b64e2689fab32e1a895c225206b169d238fa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "24745ae3ef6955b4b6adf18987d19ac2d01a7b36",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "36a1a51101c325d99bd7e71f532e8481852cf2e9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "8bf9811b9a45a583f762cba5552e09e8c3e63f03",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "be0a0f5cc564b71fe9327f4dd96ec13bbde4d505",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "8fe5a517d5fd4a3a83e8b36f5b4e959000503296",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "6b526036e20d6b40da45b7ff798a8fc97ebb9c77",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "e0b557655bc95cd7a6dc34f71d41fa8e7c4723cf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "a64c1843df12bb628346e53e7d29d8e96e118a65",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "466e073270564f16ea36ba242e169f48b6ab2839",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "d947f323df341252252b5d0e56071b10664769fe",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "b2aab04b80e1ae8666af15445642c5c89649fd71",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "32759c04828ac6f0163f6d0580180dc6d73e9446",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "f1f700ca9b9a795201e5bae8f372d307f6d9aae2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "fbd5305905474c3cbc386e5adc7a2383bf0e28e4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "3d9ec06dffdd9d62c3626fc9d495daeebb63becc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "85d499e318c91dce425aa3ae2ff6eff01446af3d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "6f6db1a8b276b8ab9eebd0bd02285db6d7672ae2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "a9cc6a5af8c2b2c4021a2ead9c41c5f22db37fe6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "1e69ce641684539b2fc2f9f9c52dc342c0076b41",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "9c01e379f1d579d3ffdce3f3ace775a95fb356ab",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "b6150dde844ef07f3b0b9157977c1897f179435a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "a2a1db135fc669b42cbad3d35ed4366a2dab911a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "13176108c8e7d7772954324063115eca3c14f563",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "89ebca36ab3679de9fac2214cb838fa5fa9937a6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "8fc8f828d9c496bad94632d609d9d59ebba94bf7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "60ee2b5a3a6b87a11a641193b2166e74290a6d4c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "76209dbb3b44329733c90e39a83d9cbacee1ed72",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "85687e0a3ebed7eda64134fcdd74c751eeaf31cc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "3000a27662f918b406173941c92356eb2c9f3900",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "9707534637ec8cdfd1f9636240d91cc82aea2620",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "0b94a5651b25e5bc04bbf7577af06f8a2ffd7c2c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "fd3e18548a325bde0daf1fa7ef439254a8ff0bf2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "51940c818f476942b1bc3c916cb63e88a9238a10",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "d79f35c4db1bdfa9640ada8dbf6be4ebed984b90",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "6d8aac0b09891ad27155e11cb535977865aa4790",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "732b81fa39d7ad763ad3fe6b6e4d9f25bda6e40d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "68f660949ff0bbdda0e86ac912acb2177fdc6da7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "33cc2cd2074acc9ec0be8bcb176aa3834b93bc65",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "3d173eaaefcd4bddb00399488443799535b784ac",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "2561ba4d3192d15d10d95cce7abc2b50b6f6375d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "cc793db90bd8be6655024ef41e81ea1893130cb8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "69c952cd784a3e21cd1a9b29a6454c0ef00395d9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "d757d0593fdcc405f51f916c2285e7743d21903e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "4d7b5a3d3f6975444d64c444233493e98df28d03",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "09981bbb6aae0874213d3212d7a9c970c6559dc4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "711d89c27a5304500149add6a3a09a249719f73e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "920a6aa6db157e2798ca4ad85d520eeab79d43eb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "30e24be56b9b8ce1d3510038d4e9e31c6016db88",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "117497f3ff906c4b98c8e8b88db3dbbae3b4f1b6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "0e6d4a9e1186b0d9bf156e405ced3f07130e7808",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "e95d47d00f9da90fa5502dee3793d274d9fe60cf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "ddd4a15dd18d705a6da2dcf8d12ec2af9014e13c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "210024dcd96c87404f089c2ea3c6f05363019f4d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "c184cd6a656e60e4535606264a8f205dfbd05974",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "4fac6209fe6a01bd67f69f91b52d0b4c9c1c7232",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "b777f5d73463d6930b2f110230ff614e913598f7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "1bf59a19f22c2ad79255be7736d6ac2c97a2ad6d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "dd20ac03da1b07b6c8f4db423f338d72910c7438",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "04606d455f7209b6804f1f107fd996baeedf7720",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "5f4a0b837f8a649b0d12449ea1a1a6b965413ff8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "7f867505892cc90c05ee8d2fa7d03ee6a1645ba9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "9583a7b4d3db3b15171d388f74152ca2a6e7d283",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "677ba17cba9bc47c2bb75e1529ab1b83189ceec6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "0df663772b3a1e47a65573a6bbc090042ed9221d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "49f9b375b6252883bd27d95aeaab237bd611e7da",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "9b531426e5ab952b03e88b378feb5672a1e5eb4e",
-   "support"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "45da314204ebcfeb33954129740eed640bfd7d19",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "b259b7d8064921910c107f11525ec7ea81722d34",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "4deb67194d7fe3e172144aef2ab132a894d29d05",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "d0b1c19a88e1ed4310e26b587993cf2c88095ce3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "784a6f9a007a41b4c348762bc52b36cc4f0b1805",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "72593464206e4b15b421d5cc00765233292af468",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "3ad3a9184ff7a39480e489195f73b5ca9d60372b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "dcdbc5cbbda68343cdd537c41b11410dda14e2b4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "16e80c285b29ffdcae25d123ccf3aa4907327da8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "6d00e4eeb09f07ec5badff081183f3b029d2369b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "791247457d94a64f1322d4829d338776120183dc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "f2ed755b6d6cdda834a0e46319b12ab24f44365f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "35f7ec2afdd7f4cca3da6bd08c0937400a46d14b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "8ffb65ba5b74efddbbd6eaa37f5fb796f5c5187e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "d2b709aabd02e16ede6249dc56b60613427d63be",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "7150dff86ee7931d05568bfc817689a34d33ba28",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "2aa1fa8d127705626b9ade6c1a4d447e7ebfed60",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "27aebad544cf3591119f04619867c79ee83ea533",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "6b2540d5f5f9b7c30f8e67aa419eaab5e65fb356",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "819b5922ad40b17ee8c1c610384dd5502b1b54db",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "1429500d3c988dade215c8683e0a3abfe4a4d2a5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "6ef9c003f088ceb0cb127f12bba33d884d94223e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "ceefd0655ac922975ee0c9ec3a641ab588d9dc76",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "e44a770682546be3a6c80d3b8b639fbc33675a19",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "4b1aa50e368991ac0b4d96c1a7a579bfc9e71d25",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "faf311f3752ca28bb710026f7baf12c4322f919e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "321f00208839e4f547bec223fc22ff39de532d33",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "2f0a2304609293dbf5a44cc3c22753811392dd96",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "28a4e866df010976565bedf4adea74e2a260909d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "be955ec5ae7d204a6d6789a587e14cbce6215d50",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "2635005c5f0fefbb085b7fbd5a622a533baf0daf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "e9c75d338c17b09695578ce4369c473262601b3c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "222345cdbaf158345c645c67c5f0fe7f5dc707e2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "8ed1924243e90f0750e8bf81b080a8af98e17dfa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "fdee7a7516f0508f487e39ba4f1b8bc1cf030d7d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "cbf87e59aa875d8d3cb60028aaa25bd3a349e3db",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "82ade79f959c21430cdbac7c6288f8a26b751c45",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "d30a2c60448c235800f9636b5405c4738d7cb779",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "d8c1c5c12c462f0904ca22f4f55285cfb7070b6c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "65a5904307c52fa33cfbbc6ed98f755f8af9816d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "d81c61c30a8978e093a19ca7eb48e802043f74de",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "ee95872bd41b5b3a205e1e83a8a70dec7392b224",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "f02f304e9a52a2e07c464bdadb089e20f8a33b57",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "fa8befb90b17ed5e4280c584612708325dc048ff",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "211cd9e521e9875296b6c3166cd1baec7dd7a1ff",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "13ffc1e1a2640186670e10ad31e2e9bb33d58e5a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "90af09cd5aab0ec1fb73ddb911663f5ab3ca6670",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "1b38c274630021bdf19828771fa88e6a87885717",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "753c68b83e85fba7fed40283530f646ecfefa53e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "6ddb9e51eabaaee86191468ebbb4fb635795ffa8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "ced4d31a52dc7063570a4373925ef69e908dda09",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "b381862d4921ac77ccfe9427171cc667a87389ba",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "29681de581f2a71cc379725332797641e010c557",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "b366a33270b47c382643d96709eb418d106eea52",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "fff8111ef0e19b07d6a098850ae46f4b379bb249",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "b3ed7b0867480777bce515d815e90a5721007f5f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "72c9500f066cf7c5a62f8a720a3a3b3eaa97c92c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "92fd3721d25c5f496f94a0df813925c6f324d53a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "ebb5f44de1b293eaf283fbb4e28f21684719381a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "611419f761384293991425008bb8d366edb34684",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "29aab961a07b63c940dfc4a7745df5ca1ec8f1f3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "a20382786540cfec25b8461d23ae33b9b69871ad",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "cc49ae2b6672b8bc513cf6a6d85b8d51caa5ff94",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "42a9b7b023c1391f5574cb94868fcb2cb27fa710",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "078ee8501327f884fdeea1b36b74c3361ac35ffc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "88ce04e35ab8940ef36dc308aa7cbab0b41f418a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "464af4b53773a12a6386d23afb9bcb2ad6934581",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "871627d216ffe7fb78ab8387ce40d7610bd7498f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "804b73315e0b4f47a9e07de8bfd0750fbd727975",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "6757947a83a93bf0aa15a4db615178ee66c572ea",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "2a61e58cc7174d92e3d23e8584c64a98004ac22a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "d3e5c18bc3e133dba689e2ee1f01eed84257711c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "3bfe8fd9c86f734146c65a2e3851b3381909b545",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "de5baf213d28836d7938c234dbf6d84b35a38e3f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "84829846daaffaa1e9cc2eeea375cdf283417eea",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "19cdd166366dc16066250584c66345bcc7bf2812",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "9c7d1020684a426a62d8f6341b3017d13b6687cf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "9e2bd4f9efbf9f47e3f980f90dffcc36262656ac",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "0cff6bfc9fa08c2da540100e0720b72b351882d1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "826bb87307f25a03ecdab4ce1742553c923a6f0a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "9684bbc28c5b8ad3678f70249ff376985c034c41",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "b0852508311c4db006b903a37d8e7c94c27513ef",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "6fdf0378e5c5391094f9917c50d9d318dbbd08a8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "dcd654c7e18f04a87949fc6a7f4a63051f7892f8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "d270cb39f8bda17187e854cd35e8f69f20d9ac4d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "dc28d81061c26ee6bf8d1d928952295450de648a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "0c32784d7a5183eddef6d69bea542024f5d6c387",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "6a846e94f89aef1e1efd67c723b177a02158daec",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "ee8605cf20223f412597b413508ac9279738ee3e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "f2352085ed0a8ed674b8517c23a189759b797dc1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "f80fe8f7daefd247a81f227a03ad0758ffda3398",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "f556af21e8dc23ebc6da62eb4664e2055cf6956a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "d7f59c41bf2f8df43246e2d7a89e0a6f9e3ce290",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "d348770a9e69b251d7194104fa16c56534aebc36",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "2155ba40e868e8a9dd16100a5051a5bff2e6a544",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "6e6860e3a044b8ebbd5f898790b4c4b8a3185474",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "815c38b5dd29b3256bc17db3441c0089f8bfb624",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "ded83d5d7da7ef0f8da828f7b29c6f803276905e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "cbcccaba567b91a5b59739bcdbb81d2c662e52c9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "5c94c1450fb73614ac87fb36fb6e2dd9a13c2b11",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "1d040a2955b83352d4bcea80244b934b26965410",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "e6e0d838fd15e34f1a9174a375fd996650146f07",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "9efdd01d344a1f066fab70956c7c70b1e19f48cf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "f2ef19ffd4b6297245594fffdb01c1e73062a740",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "6a12943b1fd7c86e584259fcee2354dee8699e8d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "67d3c1a16244343e8399bdb2602f1153cbb8d120",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "a452885cc24c41e15df598e3c6cc99535a28d5ab",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "0b6928140cfbc67cb2362e6d107accaaf9d4dd97",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "5e9526c5ecd593866571bf8329f0eede48449d76",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "32a78fbb5255e0951371dd0f6230c088033e778e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "d84a4f6f49049ef7bcf7be7f67183db4c49e8d35",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "35ec5a15fbeb6df2036b1c0edf6f58a33ff2981e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "374b1cb158c9e1c5d875473411499384ad1ff459",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "e1fb23efad1d0b8235a562f20b2c2e2b3bac349a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "e130f72c2bf055494e5a56153a3576c02b2d9746",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "4ac830a03c4526d2dee303288f474e1dc5b655b8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "04fd8577b724c1a77c5d7e25a66ec4bd45a90413",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "6f3e6f257a7d157868ecd10c799fc4039e1c41b1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "a0e7459c01e1da8f2209bb8a8503bd1b6d584cbb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "f9716974554217972ee296cee41a0c0000362b81",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "b1b62cfb5e83660f4408f1ac162c28636cf7df20",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "93c006f59f939b0903cf8da3166234b082961657",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "c95f60cb59c5ed8d9da71aa614f94ae1d2c82036",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "c29f95f22df55a76fa082e332c32244442a461f5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-   "13b3de74e09d6358504311efe23ba37d1bce4ef2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "18c5714e3a4ab3d306bc6ad1ab89cf98cd347dd0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "18c5714e3a4ab3d306bc6ad1ab89cf98cd347dd0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "c29f95f22df55a76fa082e332c32244442a461f5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-   "13b3de74e09d6358504311efe23ba37d1bce4ef2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "18c5714e3a4ab3d306bc6ad1ab89cf98cd347dd0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "83ecb90b896f308d8c29c7ecccddbb864e157fe1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-   "26e249ba7ecca4854658c9dbb4230c7f01d11773",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "640338c0e1747fa33a645fc911d3adbebfe81a18",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "640338c0e1747fa33a645fc911d3adbebfe81a18",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "83ecb90b896f308d8c29c7ecccddbb864e157fe1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-   "26e249ba7ecca4854658c9dbb4230c7f01d11773",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "640338c0e1747fa33a645fc911d3adbebfe81a18",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "7d0c6341addaf634fba1759f524fd69b17a1fd9d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-   "be4a9a26f26a15098ca90aeb1dd0b8d8102b1725",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "87330980857dab41f4c4f5be041418829d09128c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "87330980857dab41f4c4f5be041418829d09128c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "7d0c6341addaf634fba1759f524fd69b17a1fd9d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-   "be4a9a26f26a15098ca90aeb1dd0b8d8102b1725",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "87330980857dab41f4c4f5be041418829d09128c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "343ce2731d3ba92ef30fe6954b5694a5d228ec94",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "004fb3200484bd1b7463b7742ac23456befb393c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "ef2f5ff0d36aa80eb9acec1892ee6ecbddb773ab",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "c9e4e2bdb48044ba0ad7579fd1a97e22c5814697",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "530b5af744e792d6d77c47564e1540f79c3cc448",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "fb20d79f52b10e035172c61aa5dab743f15637d1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "326b9994a507934b35236f5fbc10b8e8e427979e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "cbd4159afc33e29c20dbea6cc140e1f2dcf9082e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "3bedb2ee41eef5bebf4db0b0e3cdbf84ab549583",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "3fac660ebf00e76639dd0a221a028cb8a9259e6b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "d8d9e5a1aed6663696cdcab7cb766934a40aa7aa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "6478ba73fb9724f6214f6bae984ca4953bc1a5e6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "46daea793ea171f4a7bbd36b510bfeebedfb65cd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "07acdbe76894395317cc6dd8251b50f222a30a1f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "2526f2cfacda4d53b90f7d70aa6f2902e1115457",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "feb4bee59d20f5f31596cd533af54cb528a6c148",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "4035b957050728c4307fa73544883139f2dd9cbb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "a15529459cd5a356d02738b1bc7e5e49ceac3760",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "9900ed1274e5ec538a8f6d066e774b49140562da",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "d874a5bea34370252723e73c1062dd486c3984df",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "8346d8ebee79532d1c92b47efd8555d7426d33f5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "c532e2d40fb0103e6718b7dc9e09ffaecc04ed32",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "f63abd6a25df462fdc214b740e9ad8ead5c8dddb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "b58096acd884d48f8f16a98ab864e7ff0cdc6e73",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "e6ad72f5dec437262eed099486a91abb29efa960",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "784d927fbae8eb9b9e6a402bc0da360a0111a67b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "2d078641a2bc11cd388d27b1ad0085583cae8a81",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "9699d68e608d663b04e59e406ec117d7e9a4db1b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-   "643d25eb25842fc701d2b3e5167e18c503fdc48d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "a5a665855bf8fd5abf25d55fc1b538da04da4201",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "a5a665855bf8fd5abf25d55fc1b538da04da4201",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "9699d68e608d663b04e59e406ec117d7e9a4db1b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-   "643d25eb25842fc701d2b3e5167e18c503fdc48d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "a5a665855bf8fd5abf25d55fc1b538da04da4201",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "5a0d1c44cfea8331bc0ad3d9f6236da4985da80a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-   "9174597bb1b45793f592a4729e5d64dda4807e40",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "03ed4974e1d5f6d627b8ff3e11960721e9b7c926",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "03ed4974e1d5f6d627b8ff3e11960721e9b7c926",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "5a0d1c44cfea8331bc0ad3d9f6236da4985da80a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-   "9174597bb1b45793f592a4729e5d64dda4807e40",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "03ed4974e1d5f6d627b8ff3e11960721e9b7c926",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "74d050c01e26d78297a14755e1cfe31ddec3e932",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-   "c683f39386a67d83d1ac89124e906659e1c27b3e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "9a83e45fc9b4d84bbc6844398051fcd8246f840e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "9a83e45fc9b4d84bbc6844398051fcd8246f840e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "74d050c01e26d78297a14755e1cfe31ddec3e932",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-   "c683f39386a67d83d1ac89124e906659e1c27b3e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "9a83e45fc9b4d84bbc6844398051fcd8246f840e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers": [
-   "9ce1de38843b358434a917f1c992c99d0c7fd9fb",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "8c1dd13f7d3744158b5096eeb6fecad281aa4d68",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "e0bdbf2e73871ee4e37ce56c9cb8008ee3a4486c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "9ec4e2eee2521de4ad43908618e0eba38deecc70",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "e9d372c691d9565c2ebcfa35012b0ea1215437c4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "6c2006cc43509448aea8182200dc2335956c9afe",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "06b463b95bfbe77b4e1001e9f97cd870be9eb322",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "195ae61fb6e8ae4f78b4dea688992b995db46627",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "d375decad327768e6c97d07101987d0cd9e8e2ab",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "c43503d853a7f04f76a0ad5bf91883a97ead22b5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "ca798ce4de98a3dce1a9d8c672ef3f280c6dca93",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "cc4e0dfcc6174c92910175e09ccf717924114ae6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "d46ea96f809478795bdf6cb1d0ece40e31455594",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "209789908e4332ee7ec1d91093e7d1426b5b0eea",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "3d1fb44d2dd206b96633fb3d05731b162554ed14",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "d4765f110bff5ef69286a3ef6fd7b447ef22f159",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "370fc2a4c309167c4cff0da4e84492de6dcbd49f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "b8f553a3b6b280a4e5ab07d1c395fff4f60288c6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "4f630bb76e81197c09d81e7f18cec4089470809a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "fd290122d4a480c927eee537c7987795c7abc6fb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "b1d294625dfb81eb432c65444a169f2f11b6a646",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "0abec66abc59c4d74de333a846799cd95edbd7ed",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "da74e85bf420e21f934d390b3637ec3f6ea538df",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "649bfc88c4e4115be9e354caf03c0faa9c424299",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "01cc6d616f21649295e980128d21db98fba0ad6d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "3ed141c6b260cadd3dea97c565ddcc8224bc3dcd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "15e47a4d8c0e77db698f1ac30bca379fcf7b688c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "e0247c849e696891cc76616acbadc111eb13a462",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "dad14a2029f0add4fb2f151ca20bc08a064e530a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-   "21ba011276007b5008bd2d3f20b677ff8fd41aa0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "4551f14155d0e14f8356ee3f7d4a353bf35e1e99",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "4551f14155d0e14f8356ee3f7d4a353bf35e1e99",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "dad14a2029f0add4fb2f151ca20bc08a064e530a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-   "21ba011276007b5008bd2d3f20b677ff8fd41aa0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "4551f14155d0e14f8356ee3f7d4a353bf35e1e99",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "adfc443855b719389c5bf1be264e59429f5bb97a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-   "b93ac7af744c6153b31bf643e3ee25af6b90c55a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "939a4da80c2ecedaca35822b983b53bb52d80f4e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "939a4da80c2ecedaca35822b983b53bb52d80f4e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "adfc443855b719389c5bf1be264e59429f5bb97a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-   "b93ac7af744c6153b31bf643e3ee25af6b90c55a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "939a4da80c2ecedaca35822b983b53bb52d80f4e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "e69f8b21f3677a10ad0dcc74ff4b7a66228f3537",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-   "7b6f1711589612aa5da344055f69623cdca0d03e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "ef84dbb247260e556c72a238636c893f41718ea3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "ef84dbb247260e556c72a238636c893f41718ea3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "e69f8b21f3677a10ad0dcc74ff4b7a66228f3537",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-   "7b6f1711589612aa5da344055f69623cdca0d03e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "ef84dbb247260e556c72a238636c893f41718ea3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "7a0f11781f6a228295ffd4e46b731bbff4bc2a67",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "ea68bc8d36042ad2d6ab6b1cdc1bdf83b0eabe54",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "4fb42c82c17ff9da22e4012963d656e9f2646bdc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "6029c0f43d827a95f5a24307eec5982dadb1595d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "175881f7ee96d01a84fe5779a3912f49ee084d9d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "6f44d2fce1f38b60710cd014f96ae7e72d2c7980",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "029f24397e07f4f17b75e1fe09f2528f7d2a7a0f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "acec6ab695e14a87daf535eaab6f3673436035f7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "6ad06932882b5de20721e24fddda7ef5a6cef47f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "73e4981835c3bfb0a71b33e4e6e80e2071bd77e0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "70827af78c95c458f101f4f5f938b856956f97cd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "00460d2b158d4ea2f540b68c439093b25590034a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "139d39c5a3bed3de14ab6871d3e00c36ae175e0b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "680690fdf2b080ff327e6a2544dc888e1896ad5b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "81356744fc0f38ad325a1627103745ece5da2d0e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "8d9ca03da9495ab892740e7fedf6912c5bcde311",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "2d2e433b478e13fb7aea626149a12e4f3f43c7cf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "aa5660434e429e270564a1edde95fa4437a2f0a2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "f77f66508afc2ad07233d4fb4be6ce2a56c37603",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "eb5163656c12277be71447c1d75678fed1d2c2ca",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "079b162006c9fd0338fe146619632ac6b7c22423",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "d15535951d8dddc6a3d1d4b4e33b32b945694c02",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "f000678eaed28e2bb9762b61d8df57c80e3b2b71",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "655c90d9b8ee5f7bcb4a8f6b4d721556e09597fa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "9503e39076a094b5fb81d3dd6a7a520dceb99533",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "61af6eef70ef79f61942a981e8b03ebf99d26dc5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "d802bf4d12f4fc5a51746369eb659b5855cd72bf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "0016765809ebd99cb2c1e2b050a07379fed4903c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html": [
-   "eebede0c192cc67a90fde688a6ed0ae0fbcd8e0d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "1a49a2edfa87d75d92d7ae6f983ef0cf3479f5b6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "1a49a2edfa87d75d92d7ae6f983ef0cf3479f5b6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "0016765809ebd99cb2c1e2b050a07379fed4903c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html": [
-   "eebede0c192cc67a90fde688a6ed0ae0fbcd8e0d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "1a49a2edfa87d75d92d7ae6f983ef0cf3479f5b6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "d85104a812c8721bc017b7c75c3efe3ca8b59064",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html": [
-   "21ea51aa950516ecc48d9aa0a62c751664650e10",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "551d6a89ba7b183d24ff2007602070f5fcdcfe2e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "551d6a89ba7b183d24ff2007602070f5fcdcfe2e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "d85104a812c8721bc017b7c75c3efe3ca8b59064",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html": [
-   "21ea51aa950516ecc48d9aa0a62c751664650e10",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "551d6a89ba7b183d24ff2007602070f5fcdcfe2e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
-   "d5bc828da42c761af253e2dfee751218ede591fa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html": [
-   "f6adc1f3854cab0301024b949e4042a857d594d2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
-   "b42a5b1b3fd07f4ddb0f6d37040413977d9af40d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "b42a5b1b3fd07f4ddb0f6d37040413977d9af40d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
-   "d5bc828da42c761af253e2dfee751218ede591fa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html": [
-   "f6adc1f3854cab0301024b949e4042a857d594d2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
-   "b42a5b1b3fd07f4ddb0f6d37040413977d9af40d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "f71a89d5a067f8daddd365d9a5e49f1b76a6014e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "ab50e53d7da73b1e356a1d269fbd932902b8b39e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "6285bb9dd0e60a0190031d90e345ebc61905fe6c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "17f7d65d9e846c9f47c62980f7cc62e4564b3564",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "6a3dfd52dab580ba4c6ba59f9fa66c8b7ce04852",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "48402b0d783ee76e2c2a5351810b433e6f6c3590",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "8eeeb208a9b3a564c40f9b176ae5a774206447aa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "39867d69625bab84828d6feb89e3118744796142",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "24f8a4711e891411ae963c99a286f0e199b4c7fe",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "15ba583677c74ae0f37b2750776fe2e205a3d48d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "4278df3afccc91edb8642dd915be0425f395cfc2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "866bf28e395e1ba394c9b6472b2eedc5f25d51fb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "4f0e28ccf1ba07879dabadf5a295486f195cd30e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "8909d7100e209b39eeddf87fe6d269ab81b101d9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "aa063b1769ac953282b1c1d8cda6c53570d6432b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "62b2bf6a363a234c9fef41098e270f0168e5f35d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "6278b2c790a3a9823758dcba2f226ac36fce59f2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "8bbe3d49fb901c0354d52e50199ce5b735c2c520",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "47bf32f779642e302bdda70893b6d170e8a0d140",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "ba7f97463b8929250e68febb95cb4ba9149c2986",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "89407a8fc4049d205201dbb10d5669eeb63c1379",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "adb4ce3bdaa7cf0278c46cde8fed8b2fb0baa0e9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "3dbea6f9f8909b91b1184d9e25f0d60b4bed59c3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "ade9eac85c469550c1bb55381ab212d11d153599",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "8fbec3179045263aec066b93ac4e1c1f8c5436d5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "91012ed10e93e4347229aa32073e2211c9be5b0a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "e435078f97fb9b2e025c1030b7bcb5784fb6cc5b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "e53ed40a362a32f76e29c483aa7bd5fc0f0f0a2b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "cec1e3241e7ff1fa9280ab5ed5249c41ae9d4df9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "2b501bc0e2530e783e74351c58728988b0b740af",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "8378a40426d8eb459a4cb6dca3c59382394c0663",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "d7e2b162ff0663ceb885c414c4286b84965fb87b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "b43eddfd41c3fef787bcb97c62e4787828e5ea8f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "1fcc4672fc4ee09e4cd80247f8d01682994707b7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "aa6afba6a80f662e5a09258299ded391441825e2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "a4aebd5b6c02abeaa5900d8fcbca1ec225671ca1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "b3f3fa89f00a738bbfb752618c56733e43960471",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "ede8337afdc547cbe5a90dd870792737d37ef32c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "fee053bbaa0e83e7df99baf0cec436fdc36758ce",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "d51a67fecb170088edae1d9c4a0c6a589a6081a9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "93bb6427144b04781227b6bf222f1101318dc74c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "b96ed59303b2255abbc1d6e3697b70adaffd33a0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "7978befcbb4fbbb06780d555b30c87b00dac1dcd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "83107c22a9745e396c95e8d5e2d4db48bbeb3403",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "15415806924f844bf0fcafe4c77bfbd15f8f5403",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "bfa539628c2c408bddcb6ebd386808e73caf0a13",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "0bf5e85e7f123bff6a3b8c7df3a884098fbb9e8a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "d21adb121870f9277cb04589d977a3a01ee25a5c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "ba07e73e1ae651ce66bc8d84b3f3f21f3fe6fa32",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "b1d4a3a6c2a11be76a75c5aa136012e6df084aa8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "17a3af34f5d0c4fb3fabf1b92d8c00fc0761f66c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "8440f01adebcbdf977b3212b8ba9e49a0708af59",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "d8eed570f423e57d7a68c6b5c6b04c47322f5918",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "313554bb642ff664ffd7e5edc7f6c5e3711543a0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "5215d602a823f6fd7e7f397dc71e1314e3fcd92f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "7ec48982bf71fd6211a25e6645b2a91d3cdf1a82",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "caefa979a8fd0f56477d0b3e0299adbc5dcfc75d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "1d97caffff521f9ab9f393efa3a06ca5ec1e4761",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "5e52c0071af3e0e6de261ba47e60406fcc5dd20e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "aebc77f406016043d2de649cfb0098ca1281ebb8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "431959cedafcfc38f4b842a68ba0bf427dc251da",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "c9d7de85f5b05aabae9e719e1272e77adfb08a61",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "8a8c495f79af35755db60796596a1cba437a1abc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "88f33debae8f1a09beb9e508367bcb970d7d65a5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "587dec2eed431156106fdf2818d6a11553e6fdd4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "6e4975ddd1cb8afb3079d82898ca12427d6cbdb2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "d9521c9f3bd9b8c5a8c919bf701e918142c77859",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "9650720647208d48dcdf4dfb823f77053d31f333",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "08aa2fc9e040ce653811569de28a800430aab6f5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "19771b222b917632519ac068e83bf6d9945ab3df",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "82db2bf5149a91cf0a4407ad3c1fb01da125e04d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "ad2ac0a5cc194c56fe4120b16f1405516c27c2ab",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "306a53536ac57625957da5cf4ff55e4124276617",
-   "support"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "0331c47034aa371bc82e041b5b9aeb24130dc974",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "acf164cb0c84dc24f1d352db3550c41ffdece96c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "e32860d57a99272cde8f663ef64f4cf78ab52369",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "8c7863432434e5aba5cd899854aeb8cf1544d352",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "db83beb26b0e66f94e827852b8e2c0c5baa72163",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "4fbcd00200bde29d6a1b1fe1e79a2abe4e586b76",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "25321730bd1725d3591f819daab4fea37dc0f82e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "f0a0559e9daef343400714cb969e5840761cea82",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "7b9dce7cb56dae18f3f2cdb738b47a754934e308",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "d601be6ac9e6822a07fe55dec7ff8a43efdac3f2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "0d4e85774b48b22fdb26b001970745d4b9a0d281",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "af0ebfff8652ca2c5b8b7d1fa9d40c1ae24f2a9d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "be79f6d384eaab6eded689026a600df2c2754588",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "2802fb27b509ad803759141c18181016eb5a7d29",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "a5cda82030e0ec3191ad36a991d1dd9883a3680e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "85f8ad04e6c5f3d8397b1ead37c488722776654c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "b4faa1d016430f8663824cf15d2290adf4064649",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "1fe71db41ff2a4c65bd9c867b16aaa696f73b6e6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "20031b40fc843f36f10517f5dff6b8ae833dc739",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "fd87b73e53d7763fe512b6d2345e848422a66b11",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "37477fa39d438303f4ac9b87463ed114685b7066",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "bd97c5a135d87bab977ea6d546f1353dc812c8cb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "7c49eef0f93a3bf07f4e75cbfb7236535dad5052",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "47e75f0f8762c50274781a170cef9cefebdcf619",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "e949108885b68591b9572d2fe199e7ed0f0f4ac7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "665d255ffac8b83317d46641c10efe63cb6c9e1a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "ccccda10faa91abad6b7d1518c4d9e60c4045a71",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "5a225b0e49732d797e037afa8f110e8566ba4c64",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "3c3451162c0bea8569866b4cd770133a4a8f8607",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "9667c5ac9f05648c9367e8d37adf6fffbbb342cc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "7e32c08736d8304ee6d306cf26f7bccac291000d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "b05801a3a7c16dde0ddaca1d0acd6a8f97c497a4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "b05a63574a0d90238623e114ae74e3ca45f7a2fb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "b06ffffe0e55d26532a9dc29b355c3332476d2a4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "ac2c965196c054e9cfc03137b9c34c283e849439",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "e8ed2b5589e174bf7b09b857772bc812d05f8ce4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "20d18f012228cc026027dcabc511ef1d3e4fcf79",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "49ad6dcb1035a11a66b1d51746d3a9535d41f755",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "1329e58f725030ecacc3faadfdaa642fd657ff0c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "422ade7709e589db10dfece5d8714f9e78bbf1a3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "9d5979cef4629968c7eec053a11a297d9433da5c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "b9f39e7b6b7cae7e909618d1694dec300f816406",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "7e015b859d279cc3db41afec6d03c11fdc212b5b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "e8313d85b7328e9fa8484d52bdcd814eaed53dfa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "116b46faaa444f46b4b8d7681dcd3714a1a68d78",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "ca78ee5582842cc836f56ef6ede75aa94d43748e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "eda8846df09d76829d2d7d1707e95237ce04d254",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "02ad3f381293b09819fbfa92f25495c5792c3934",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "d56184246f4532dd872d0e5d11d5bd9bd754d107",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "27864e68710f5adc65aedb94403ac752a07e2d19",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "3c7b8573e7e264ab703ae528a023ae20fc3049cb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "073526e660977babb3e8dabbb75cf739228dc3ab",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "441778a4ca07a20215d43463efcb4d0b994f36ac",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "573661e0e09fee34e7d900db36dd7c60cbbdd3d9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "0076ed61b34ad55447dd64d3a5f81a1eda67e07e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "ac19d40181d211da4ca40c2094341d9395c1dd6e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "b3527924da8f616c646155ea186658447b9ddc13",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "1de21553f52936814a835fcf03d532b95c850fc3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "823bea3dcc722e3c686294a07a31a9bbb4e6692b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "f3938f34659406187fecc56b7ac73fbf3334d480",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "323fef9651895737e85c51e20ad07629a952b5c2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "44e3e9168c415e679d48b571222d50a3688c9487",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "ae49ce7fe4be3b4f76f366c1775fa9bab822f3e5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "569b935c6e6b8e9516203d4c3efa9a075e1e8dbd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "d519377294d7c822b794e325daffcb5f5a233fee",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "1ff731980876e305f8fbdc529b888ea8ffbab20d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "669437c23bd9e4181a520d8388dc0bf18a6be2c4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "8ba60eeba2324ef1645e210cdd1eb65906f01c7e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "01bb9959d6ef74957aed63c0d5e019afc11c8045",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "e52899ab422e9f14372ce8cbe3b8554000b17eae",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "c62cdd6580444accfba571d9e4bd8886558fdc72",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "594b8ef53e7bf43c37c4bba947dfd40a21419500",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "64c3e513117a199b87a1987c05f5b743db951524",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "07b3f14fc1cd02e6ed95e9997a8278b709298763",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "f5330d6d5d596d756138f21a986fc6b524b94980",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "312276b046535930ad5310ddd78e0a54aa33261b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "3fe953a3bc598e2f0ff75175ae3162f96aea6473",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "f7c408785aca740899d3ca292697691619922bef",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "37fd0c7e59606a4abab87deeacada6f8dc5a1174",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "20a569d073ccc9b04ca938f3daa00a76bdc96fba",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "33143fc49648595b9dd3d51c7145fe942423e8d3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "630f675cf67937852b81542b8a1b1e8ef437f2da",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "3aff8cafb678cfdd4cf7e4ea2f452619e5806285",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "9bae615f2e80f912633d8ccf0437f847b2c201b9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "fbccbc7a3b56774ee0d2533b4d3bbc1d0971fb51",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "a35c040df051f31273340085e13f1bec291937f4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "0955920c15c3e6e04af5d6d09cbbe6a0ed80d436",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "b940da776190799c1101a43e59381a27f854aabe",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "ef42cade596692108ea093fdc7a0d8f59df9011a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "e7e817356d60ba14f2ed032598668f7cdf7c5735",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "f15ae6275cf38d1922b5a2fa1843fe7082054ec5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "6dc602b5fa73e8e76aea10d65ba1a54384af37d4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "3713c113ed39c8f76eb885888f43d0736fbb0987",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "9ce9b038cbc470e099e8fc9982620ebed7684db0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "5803a58ff636d22ba127e52a5e5d6a062ab40393",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "d6c1ed5300c49eefae38c16d9da3d039243a5746",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "6c5d363a78aeaa3e2707d660cd3d07c0e49a549e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "db4a1fd200fa77e94bae01ce6c46a3be794fa35c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "ecc61c83f9e4a0676413cb4a9d38a7795ee60ecd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "f55b88eb3bc34dcd8d60f3cd930e1fdd179fad2b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "d7f136b8ef935d558eb466358c00405eb254e2fb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "8503d94458ddde138529133a409bc91d8601935b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "a1a7ea824b978c582e71ec7e0a0853213aa6e12a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "19ba88b38975aec196c5e360bc6986bae1611749",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "9144d3bdd9b1866fd3e835a190e37f87f3a88b7f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "1656f802bdc6c06ff095899e51877334431d5ce5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "3f9e73b0f47d4500995ffcad0c6a0eb809b4f741",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "19902610e43ca0ff07b5f9c2d48f0bcfcf90d0ba",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "3ae0fc113f771c208c00bbe7438a548d78430422",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "c6a25b099cdb09c5a817b5833138d24db90c8bf8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "012454dff81cf6bf00996c3c37d185dae84ddf82",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "802b76c990daf5304d9b2752ed0fd1fd529a6173",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "8b68bc2e7a0a7c011141021c2a2b52bdb1047203",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "6808e0eeb25aaa57db7f1fd462b9ea19b49e567f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "334f788ff02527c5f50596629d35df870c8869b6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "f3935a8d01a4063b64d7a1a99b92ddf21b443a8b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "9a19f366a4ca186471370c1a9aee41d2b00b2d32",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "54a58f0657babf5aa67ed41c6ecc3341fc70b14b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "973d442b22d37f215782a5fda395041ab0fedc6e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "db9e8f45bc31a2a4e7ac6d9927236f85d607e657",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "24c16d859ff799bd785e639d047d0aa79a66ae10",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "54991a5baf28d54baa1eab805ba24f266d58657a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "8f1e8a637941638ddbf4321af40ce929f9cce6d9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "eae3e204605114641d8ce4c7a69bfef8baf0f823",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "990ef33627832fca4a3edc7709fbfb8b4d8905c9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "9fb89ff1955b9740c911dcf8fb978038eb008455",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "1a63a6bd5b0da9ab988365f660c9f4738b63aba6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "945ba27e398b3128ef893c993d7375d2fb39442f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "3bb1fdabae367b9fcac800a29f656f135fa026c3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "47cf5944b6255a0c76bf42fca54abdefa2adfa24",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "794b5716945bea535802cd3caac3b3fe8de77e56",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "d6858676dd264c280dd55fb5e4dc8ff33771cae3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers": [
-   "309da8091a927735fec71fbd4af9acb39eb3a964",
-   "support"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "a83240bcb3ad5c524cf92c68f5cd94f19f191a2d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "81806a28228cd9a90dd581a33cd5621001a806fc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "fb08052790f857fd00f42dc804014b3ff0830fd5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "22c0872e4c97867eda4055f2f6f58935ddb758f4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "933c595821957f6a96e07e9d0e9c1134c5187851",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "01f217fbda4e0eb50a5ba58208cd51ec9926fb2c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "3f816358332221c3c5202fab8172bc42633c581a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "dc9c2bd864eaaf760898e9c3ce9be35d519c945a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "bdab5ff29b5055e197d30f181b4dfd8504fc4576",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "861b4ba196334da4bad3994dab3d80d84e457faa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "4427f355087829ef667e09206e784f6c5cade816",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "fe2d26bc276cbb0bd75b85700a4a9ce7db0405d0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "834b39ffa09c66d901108e100b7f8d7f73db3e37",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "60931a807ae5f02689ea9933028dc217b265c142",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "31343636d2232b7472366f807e5c81b4983d1150",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "be07e70d3775a2bf6aeca6b31561e964952427b1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "5e958d018ce6186e94687b846c7d9eff931f4600",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "6baef59ef21864c7ebdbe2fb2742fce7f6b8a34b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "8458782abc457f2c150a936aef98e6760040a61d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "0d38bcfe37f8af2e1d6b66dd5137c07c683697b6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "5212d8281b03f869869fb0b372fb909900d5fe5d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "319fe589c18238e4db6bd80d7c84fa9a09fc06eb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "4356afdb21b7a9772c2b33e8d1b902491fc47a3b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "29605ba6f4b7e79519be07c8c6662f477d49ce93",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "54e0c02da612faf44f3d3ef9e4e883d27cf6e26c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "ade7a69448cf3f9d108ab751b1201c3e36b39de3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "9fa93d4c81f7c1400768419ae1811527721577ac",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "b781baac14f69a77d23793a2ee066b90bedb1481",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "e5bd3e6c90a0e1d08f9842c7297483b92b275a66",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "49ca274bddd7ae8f8bc97bba03c546c349e9850f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "16c78406d19c7a3f0fb2349801d5e4d644564141",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html": [
-   "8b732b83676ced03d567975231b4795c5ab9bdfb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "44d490586669b64125953eaa06c6e43de7b87d96",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "f928a811ccfe6a6d5a696effd086507e9580275b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html": [
-   "43335972ee2aa9220a94b319fef1b9926233e783",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "a5260dd272055687e4d2b56a8b7e46cb086da77f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "ff26a215f4da1e9aa858b056ec8fbe3258956b52",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html": [
-   "7d908013e69aa5e94d2698a52a8c20088057a699",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "e3aace756e04c6324072b2e37f2935033c279be0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html": [
-   "46a128d1ccdbe3549e34cab17f33865c09d24c68",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html": [
-   "e997bbb313bee9bc3c7f66b0fe5d63f9feb6d6ce",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html": [
-   "9ec94e174b8ec1843054feb415da96e06656842f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
-   "676877a32672b6ee61774c9e35a9d3f1424630dd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html": [
-   "702f2f80c298efdbf8afe0cbc42fd7e0f464ce27",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html": [
-   "efc4dca2897f9cfd8c74fdc427018e12109de40a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html": [
-   "17c00cad00e50c38bcebaa3f586eac5505e14b2d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html": [
-   "96b614ed5c74f752224066a7dc4ebea484966406",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html": [
-   "9d8d15126ade7b45b468e808955f7385c145ef78",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "78bb08e9bf785e009c6965fc828472a5e0f3b95d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html": [
-   "acc7b48132efd1f82c682db119e520eae17cb855",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "52d73b3986db10ca9bda9216affed760794f841d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "8ba20f9d1861affe784cd992b10b210a80a64a1a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html": [
-   "bbc7105f2f66e4637338d862177346adeeb74075",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "1d7be646f4547c25d5846a4fa54e49ebe0a21a27",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html": [
-   "32ae1d8058d60f50dd050c5496ea6f64f31348ee",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html": [
-   "df69eb5038dd57d1fc3c63ea4b5c3ad5882c7a70",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "383cae4607b1a813761f9dfc8d13944a4d26a89e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "3ce89779567fd847c7c2101146e6c6a4e3eb4c31",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "8bcd726fd7238fb371aec45b1058e145aca355ea",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html": [
-   "7216f2eb9c53cf415f7a8c08da28f9924767230e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/spec.src.json": [
-   "f7adf5560cc5d51b3dd7409710fff244677eb4e7",
-   "support"
-  ],
-  "mozilla/referrer-policy/spec_json.js": [
-   "7876ce88d7128d8c8dd24b37cafac70ffbfd4a1b",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "045bcac93b15144d7ec7dd6450ccbeb37ca25c0f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "b072b5a4c02515f229e2296fe19efd1b75da5ccf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "f2ad2ddedfde2d1a0fa78124ef00da70c2c975d4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "9179811d1c27e962d7d53421d9419fc2832f16b8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "e2b1236b67212a61a5a8dcefc370e0803c068a43",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "d0146639f1d65b7537327e9a3ad42788bff988a2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "070b061df98611991d094b7c158281e132ace620",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "07489ac9e00033b2be16cc977d8a52ff8496f145",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "f05d2d616e3fc66663816390444604a79036b509",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "a05dee44af0b17293eb0fbd751e5887036426834",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "9cce7e804ba3347a67746993945f3a48caa21dd4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "b30b4c6d30fb31c005da79deefe196d0abe994a9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "1f98c42c063cc621300c6619e4e29065972dec9e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "9d35bc3e9224aab0c09f119585a7cd79ccd93707",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "74d94a62ba1a5bcf2f785378f5b6efe124bb84b1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "2d11018daf44c4fc9babec0e7e559292c9e076a2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "b2c328fee1dc274c19eda1b3da840166fefd6478",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "a42dac5ea8cda9a77d5505aa00fee3c9474fe2df",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "b7ac053326515f831e521693738f3a751d5e4957",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "a90bbbda2dce6ec1ad09f2fb80e38faf4ba2c1ec",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "bd0892ddb93b8b5348cdf7dad134ee6b8e980022",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "a061edfe41a4657f847efbbffc8003aeae807bad",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "aeefc83108bd43b393286edf4ef57d8737dfc0db",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "4862ff56985ec99e8fcb09e9e921488da244f3ad",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "5954ffb452decbaba64f55a289df294f15a67bd4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "bc74ed88f3fac75e40cd59068f9d7b4149bf3ed4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "981b7cb433a526cde6a7c06cdf421057dd4b691e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "581ce7e211401b175d237bb34e8c9731d920f8f1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "eeb41bebe4b635f6df70fab13c31055053d1bfd4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "5835df3255a061dba0e848d6572efd78877de896",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "e3846614b50d95537293ea3649e964cd7de71079",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "3dd9dba74c69e608802caa3f9fd4306030d21385",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "5a939a0646a97765ffb1ed2a0bc26dd7f34d76ad",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "42a081830760ea4cee0a1f17f7da458730bab781",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "294c34988a0bf9837b0facda3eeba64051100ebb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "21cd12c78a7c842c1b211468ca5a9e267d60de08",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "a3e03d25100d6d54212b4eff8397da7d9ffe9faa",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "7cb2cf9f28223aa4ebd7f337105729c8ae6cfa81",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "877481e52783c8a4ff33f42102bb6b5375803708",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "812aaf97b3b66f73e6ef719a3d975bfe9e320a64",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "7079a3ecf123ee1bfcf376bf6bcbf28a7187be61",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "4d0abae23bc953f6dd50a7252fd4b72da4a936bd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "263ed4ad8a3eec4e4144997a51f282a016fd1539",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "0d711ba831eb13db4bc5b511d2880aa707a80b0a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "a776b110bebfdb9233428d6fe24d69d503e17eb5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "4d3ec5a2d28efa3d07fe26650fa7c92b47314e0a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "a4f6c9d4ad9586a27990986ecdd1d7e697bb1cd9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "3fbe4baf4aa8daaf980a889a0abe14e718a3b281",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "8ca7b4f8019c87667c51cce1f6024b1df51825a9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "03536b7d8299eaa3466a7c852f10fef7a1566d90",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "312c33065555d9ddda194be2334ac61ea97d770d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "38ad3e7c7161a4304e4b54b905e8b569dd8dfcd5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "26a0b4ca86bfe713160566f13752fb99d9b8e7ac",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "b2cd36278b0f2fcf2e24eb33234f8857db10ab23",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "e07172d085917b5d187cd4e662831b1cd702c433",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "e698f8d2370c6bf6c23a84abf7c5e4f85e7ef548",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "d63b7a8d7340e9b636ed49c3af16fdde16a9d297",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "3296688b653f2e4a1e4cd6e30f97d1ebb0990646",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "0798bd32eb4e18d4839625787db6ddedc81a0bfd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "be0c6556d8093dc402ae82d93e3fc1b674aba4d7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "04b712594d29e9bb881646c783f077ec4dba3102",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "f77e949d08809e980d51c084a9665b605c689bd5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "227f9f617a9321554ffa746a922f5c19ff88991e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "7ce1dbb27239f16bc823905e1c477be23e6b98c4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "b221db2ce0f305c24511819bb18704fe30c01ec4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "8732ad05733831e91898e6a77bd18e91eae26316",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "dd2862159a8833ec2e3549aa28112bd8a90a3f89",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "2b65afe48cbf3ab942eb5cfb9cf88728a9fbb235",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "10af95e08be564b5f2d83b05a1632f7cc5efda66",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "9d1efa4b78ce4c11980126a91ac90ab781c743fe",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "20262f9f3b6862861a0ff1913e97bc3a7cd0ca16",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "1746e7e2677b13ca4e9c9552d58333e30b6f4638",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers": [
-   "c67e521584390fb6c068bcb1a814d73ed9543570",
-   "support"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "5716de7f0e8f9e39af4fc7fc570e6b2fcd88f092",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "474328d554e5544de7209e22551236c960aae246",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "9119c33215faf909c7c3b46a2f80a7eb244e4b13",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "68e5be85895af34449565f24fc6eebc0124f6328",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "a801987ee422f647724dd7fcb4f61c7b4f077c1b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "0ebf097f52801d662e32d3a093490cb891a0be46",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "a80c064e057347dbc6f70d463a6c18cb4114f7bc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "44cdc96b39620ad9d89cf6defc0183e9865dd5c4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "0f6c7b8ed3cc6ab96357411170f38ac16a306c94",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "54168c30911f5a57f12637579fdc683f40375c14",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "5d5d9cd8b7db4f3c9ad8106a64d3ad766f2cb11b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "c0c70e205b02df2b6b749b7edd53c997c35f9c53",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "5bfd21dc67081da359a667219375c1b08de68772",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "9518a8345df04485fdf7620260537bda7a83b1bc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "d417c51a7f770a0cbc87eadec55cb11646113409",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "7ae3f843b61fc791791e5ffb07b57256de486791",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "6e8c66b0a992df591e705598b10a8cedfe710a0b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "77d8cd3ba31a22a85d10fbf90df16e8380a32c63",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "9319c0711cc44366d953c19fc73d78c8c8947e8d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "3ee2577c1a7da66141c99a06cc39b5a8c46deb5a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "4ebbe2ddd680d9d8a5b291c0a00da271844ad797",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "a3dd3c178df196d3d5ce1c17abd7fb7390a5e645",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "710a6ebd92a83617bb59a43a4c0a6fe934da7d2a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "7c0e976cb3cc9d6cd242d0fbb421f98ec830d0c1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "827e86e657b969b802079713932741a8f09db15f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "1d3ff489f5c63c56c20edb99314f8e7d2e9f480a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "708b60ad81a8dc0fe16cf2ea90c05f29e04c8037",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "305e52dd1d44baeebc282bb993926785ae655093",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "0fb463d9cb9da487319ad26cf948b96edcb922b2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "3822d95abf4735df6590aba9a65e57abb8d5be2d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "1bef209b9f5d6236d5509517b8bf68d416a76e88",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "ec5346324fb0c8999b2f85a161f604263705289d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "871a644a25fbdfcd8f5b4b9e27cb57ffbb32d60b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "a6e4df5a70c889e098eb6361537578248c1dadef",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "774f8c38071898c506ac27e71fc97529c8cab901",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "9dc8ef78ac8f3d21975f157581ed5ce247ca11f8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "de16edf2389c2cbf1d41913c2d3ec061b7fb530d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "e01d1c5974ff8a81f35e9ae9802c37aa7fcbf18d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "a72d8e10263211471173f34cccc6a4c2b1008a36",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "2e7b085cb1261eeab259bd79dfe5c2252dc303d2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "0d2c537c82a1ea55c1be4f1322379cb2be7dd9b9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "50aa24f14f687670262c93b23845f91962c219f3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "22e054e853ad9e0f9bb54991acc546e9827d991a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "77b72dc6beae94b15f5a1ec7a6a311c956c5dea9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "de394bd907a5ea6ce3e8d37a250f3cd8048566a5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "4f9d7a427e53bfbd0fd6e16c8479fbce881df859",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "9eb02e21b6a0102782d4bacdf9df0bae67a3e097",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "0788cb7ef6085272b5937ec378b779cecfca35c5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "433d4a88f55678d58a61ce386da8241a60ac4519",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "34422dff172109a95950089be1a58f81c415d0ff",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "674d067c799e989279a5b4e0dca54a19f59306fe",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "9c0e880d8e2c1a639ff8cb0e020196a1ceeba74e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "0eaed368b9e4c088f92e490450c52eaba09da39f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "14064694943e8cbcea385a80cda5a751ccc25ad8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html": [
-   "9441fb3e141e4e1761361c184e71fd4cfd4f6258",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html": [
-   "7ab0e0b903f4dc82460edeafecc6dc270cc9970b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html": [
-   "5b583c374070da29b2ac2e8fd3dfae9b68ced490",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "8a60d8403ebe3f4133ae4f4f2bb2570e9eb1345c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html": [
-   "36375ec69a10501ac7724c71c02fd0174cdefbf5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "d86a2c6082a12501ffdae0af3eb4098a7a0f476f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html": [
-   "57bd3fea383234e53578a1705bcbdd42790a3a39",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html": [
-   "7bf66e45fe9a18cfaf0a0a039e6a08dd8bd1fd9e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html": [
-   "3f3b65db58af02af0fc5fba1adb3b213cc8a98e0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html": [
-   "2d8ba97e93314f9e28768721b09e2a14fb47f4af",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html": [
-   "d2efd78994ca4b1d2ac670b152500f977934b168",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html": [
-   "0d4515e10735be0b7cf0fff4de85303bd17a5637",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
-   "0114faea5394668172a4f907b1577eb634eef24e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html": [
-   "c0513b162861ea49e599740437c4f4c2d9dac8ac",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html": [
-   "b6ae226d38038920235f6ecb5dfae201addcaa0a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html": [
-   "b29c17497eccab22b0fb51cdc1fdc3e5d097cc53",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html": [
-   "351097a301c936d47ff8130915c58bbfb9bfb30d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html": [
-   "1229662156c9cdae2183ce5f8041f14075980301",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "93b9d5aecf51b8983387b38e1db45fbf25ff21c6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "a91cf4ae8c407f19b6ce0c20a9f62d27ff610c60",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "8a082d8ef39c4d227cea725659edd9bccce9c178",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "be90b8116e35e9bf891587bf17211f2e990c844e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "2b2a2ba1773e932fcd1820d999af35846c8a1272",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "3d47e720d2b633d1af89f9bf0e07abe0cbbfb042",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "4ae0a5a4c03a72e6a8e82cd2c9c617e5d61cd607",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "92c40cea6b562cbf912c625753e453a7081683b5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "e4249e5fbd4eca364bb3b8317bdc7c108e7964f7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "d6c5583476b6a80ce170c37bc427c697f3ed1a65",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "3dd098ae5de786f5fa375986eed546072ab7df51",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "185a330236e7c97a240d06b4695bf2dd891c8ccd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "f0801c98e27be58a148d203697362ab89bc2911b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "d61b377c8502a5e8ab192b75dec30d71e07d9140",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "1838bf18b14a8eb32e82413d0a727ea6ea324552",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "5ac824c07c17583500eb23eb6ebf1fb5128927d9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "5b6ff3a0362bd9df7a4b4cdb305534d96bd3987d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "0c2120e8bad570290705a0b7690807e1b4f0908d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "afe427f1c7e81936d9aeda8b2f8aee6660f4e0c4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "b8fd5b6b9eb728805cfbae401765bf77c7f196fd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "f83fc0861960efcd41fb99d3e3cba6328e090d1f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "feb927b1ed4c8b46355b5aa2aa0884ebaf2464a4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "2493c65f1b9855311e4895facf54c2e030de4b36",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "815df682caf0a5e5e03286ea6546bf3a758e1f87",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "6c298ed9570ff10b021a2d33826bb5aae34c9b68",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "9a0fd2c0706b3177e47591ace284ea71ad9a972e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "78949fe10460ca39d3028540012f5c0f99a14f25",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "9c0e166e76828b83cf03b02fd691cde98e4deab6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "84231dca9fea75f7dcfcf339aaf90aff456c8e4b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "b82a55099d0350ec33335d160ba88219f0234677",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "e1ffc5ae0c354cf77c9c8ba9a1d0e6f42e5c09fe",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "6934e2d6bf48b6919c469ad4ea9121ca5a54beb6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "27e8bd2f3f41bffe543da229c047323ad8dbf68c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "b2c4bbfa3b73e0711df66b6f69655c3f7683a7c8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "f713368e05a4159895ea7b9ffa01e1729a382a01",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "b35b54ca2bd796d4887d2a12858a4166328d6854",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "626d8f9d3c04ff18f36d7388d53cbbf2fa6f7e00",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "3886b0f939c8ec2f059fd5affeacc95b7b2d7179",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "71c98dcf126a061b5bdc0658c24abe7d85c2094c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "5a5f46e6df87cb18ab34b9bc214311cd5774e176",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "c833910430a30037ceee93ca68fb87cf49e8b41b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "2c4b2eef4cb8e9e1ec72f7239d7beaadd6395d8c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "8f93c3fc749b2cf99a0449cbc8adf80335f14e88",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "e5fd04a01d7f9d93d80a12337f6497a1255da91e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "981cf11264325b0995abc9f8c082850a81fc7cbd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "1c0105ef3220cdd305b666b24aedaa3a7447e018",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "011e36d58a7c7da6b9ca0652258f90f4d3dff939",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "5dad3ba66086f56bebc6fba6b59031378075e3c5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "e3f741809200560da2105512947c6e3817b2b74e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "12a40677144f3962355ada366c94fdfe71de09b6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "eab63db369c1b784d2f8475dfa4b86e5ad663b10",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "21098f78449da64ff0e708edccb057bec21eb3e8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "8e68ef3d19034e687939d9b1af27c69aba37ad56",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "b8cf52ab72f39358745fae5bd8f42b9269031dec",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "26014f6eb130ded0c53e73c140c842f455f8ebaf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "60ea1c31c6134e839c241cb8ad646c0fa8d87f0f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "d99a44ab922b9997884594f30ab83ebc6b669444",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "732d552c234be866c179bb531c84c63b196948eb",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "9f8c6c1e641acf408bc142bddf84f79afbc7b3de",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "4ef2c6ff1f8d5378adc292d8b39e407b79891592",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "2eecdbd666160ba19db887b260243800e3ddfbc6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "eae2e6c27ed21165433c47626b453c581f399abd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "ec962e1c0666eb0722c3a9d781f8cbf3460b5ef6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "eebae7001920e1ef0c124a3fb16fe39727af10f4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "86b4cfc87033cfbbded098386724faa1e0ecf1a1",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "999ce8c8eaed60028f8038c0fc67c47f5786c746",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "bf2ce337bd7bdbd12a81fa20dbab7057f0b7f390",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "cb1e783ae1135c0ba8dbfc647b84f700b16c9293",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "aee070f673e6ddd56c43e75914cec7eceb41bc91",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "171754f6fe1387a7cf49df9dc92a127d610e8664",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "bb0f7763a46e44738621573f7fe1ef8e6d44a9ff",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "f88d1c218ed82be5ee53f604ccf1fc88c5e00500",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "1a31f648665afe8f6086f4c9ee0bfe1f5224b04d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "7a38303084805739eb3684bc77af399dd671d2a9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "dc59e659dc029ea9b78ca9df26677fd5fc30e987",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "1e18aa1d42748378944f4a2b55e95bc541630ac7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "04c6cc0ed50c19d972da7641e76b86ac079418ae",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "41a5a748d02bf4b34c31022da14b71d1c8a714d8",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "29f92f278967225821303b5e004e5acce248e185",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "c0b6c896f33795ad408f12183ff8bf94dfaac8dc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "a8982c2d32200d5ebb1cbba7d7dbd1e4c547963a",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "cba8b0c138301486662fa8f53bd7d6c0495fb6b4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "d22406c8c678c1b077898c8835ed4ddae7aea89c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "8a51e5df6bd0c05ba17fd297f9cba7a3743c112d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "80d9e8bc3df020af6f338c25dc96f8d9261e5302",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "115db8635bf045db3703c84c3b55c5f0facd0317",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "7d796ecbe70ce7348f6d297f00d397d37735f4e2",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "ecd8b40bee728403bb69bdc35d4ad5337349e78b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "0b07e9e4be821fad30687c63bfb12fe03d70e0c4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "2863f4fea64dc5150b47c5ff534b7774cdb4c1b3",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "2950ac7c8e882d2c3d65422a56c427cad16b7020",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "6a3b56e2dd1281f2acecf887993a70c785e5d6ad",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "9e7cae1f028f6578d0e95b3eeda346114b8b9e67",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "947e96a752474b29daa8b063ef7ad2ece07d0b37",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "d34ef9a51e97fd2814b9124fc90c11b71c4cc7a0",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "325818ee6add388d3268fbc66f4e4cc28fe11404",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "d360b62010977483dbb3f8f9227ee440bfc75bca",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "4f7bd15bddae2ec63bae5019a2a0d0bccbdafec6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "d5c67e9795a0c32aee66517229c235c96e9d85a6",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "8fefca756d4cd7546997ea0ea4c0d44b0eb80a84",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "85deff7538a1c05fa23cef26910bd995e1ebd406",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "6b7341603ebe64f9d7c09362823ae02e38a1aabc",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "c212c459b81195793ba7fa741c6452badbc1a171",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "e22ec99c4fb2d98556bb17051d870ab7f2f64aa7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "ec780a6fd6cc5292edcffe86c39144b4d325fb1f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "ca599a8cb287c1af59a97956ffed09f4f2ff62c4",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "c403586ce593eb7dd19a955b4aba2726968f159e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "96ed707ad5bf1286b794c342afe9a1eb15793335",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "7c088191c076b96dbc315750382a6a858c06fb34",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "d3bf4236f99e1eb2a43fb55a43cfc4dce0c2a40d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "03aca9aa172fa5628a7037c5a90131160f87d8d5",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "1d456ab812ca5ed719f021a1f18a12a321028b3c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "02d188ed124f46f4d5d05a39284c7b2a1bb7d0ca",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "0f5f1125620addf229e8a2c5b416597df83e6975",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "e3287be7b4a4828999b213d760426a7d003c3064",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "e33fa22a741805cfe39e95607ce56d60e60f2c0f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "36600f3a7d537da6b1a886a3715c0ec369bcaa81",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "52579447a991c2bd54e18bac33d539bb698201df",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "e38ef39c25ce0e3e836a434cf995c69a0962e077",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "6e94b34aa03ff674eb654517cf5d44fd7718a540",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "bd38cf56ace50c40a59dcc74d20814acd27a1154",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "e61f6b25f33faa5419a50def6442b9aa0ebe5cbf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "a76f757cd47cdeb52da7a4cd97a5957cf6b4d637",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "1473b1cc796a8b2950f938a973634895791567bd",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "5023daec8233cd5d57e8f3dcd5aa47f6df17df0b",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "37e93fe21154453faad68e937fe75012bbae2466",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "748621eaf2cf4488c5cc56de9d64179e867d13e9",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html": [
-   "5a329637a5d8e88cf3c428f34733948dcce61d1f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "71694c1737f70fa949d0585a8a25a75a7213ca8c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "ac4c71e6d3dff1053fb32949b245098e0d680290",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html": [
-   "99eb5b4e0dbc8d22b082b5b0ca0e6b2dd11fcc73",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "ad0eddad5b1f5cb9d8ba80dfe01f5e45dfa0ae46",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html": [
-   "24ace89db1bd3bee36417e8e045bd211c32d3fca",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html": [
-   "54a470dfe0171790222c8e30925de7a41f5cf335",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html": [
-   "cb97cdd3aa38c34905af2db0292523eb597e5a31",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "f04c297234f0875b38684d09ff54f6a4ea848b6e",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html": [
-   "3dee6be3ec6159509c180a11be271612d1a4bf22",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "7b39649e1028dccf184752a644c6867f6224248d",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "1f7023b18ffe63441c9dca110d2e5082fa739b9c",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html": [
-   "e74ef31048052fb34afcbcec6680a2f9a4172843",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "d91ba8129b7a0e6e88271775401bed1426cf00b7",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html": [
-   "c369359eec64205e383474c48638650597fac23f",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html": [
-   "c2168679e58a519a5ed27f82cdb27bfd529a9bbf",
-   "testharness"
-  ],
-  "mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html": [
-   "d4b78d316c0142e9409f45de333fa0a6903e3317",
-   "testharness"
-  ],
   "mozilla/remove_link_styles.css": [
    "1984cf7df21686c499942929ac342dddb160af6a",
    "support"
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/OWNERS b/tests/wpt/mozilla/tests/mozilla/referrer-policy/OWNERS
deleted file mode 100644
index db2d613c226..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-@kristijanburnik
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/README.md b/tests/wpt/mozilla/tests/mozilla/referrer-policy/README.md
deleted file mode 100644
index 9d139c8e71d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/README.md
+++ /dev/null
@@ -1,245 +0,0 @@
-# Referrer-Policy Web Platform Tests
-
-The Referrer-Policy tests are designed for testing browser implementations and conformance to the [W3 Referrer-Policy Specification](http://w3c.github.io/webappsec/specs/referrer-policy/).
-
-## Project structure
-
-The project contains tools, templates and a seed (```spec.src.json```) for generating tests. The main assertion logic resides in JS files in the root of the ```./generic/``` directory.
-
-This is the overview of the project structure:
-
-```
-.
-└── generic
-    ├── subresource - documents being served as sub-resources (python scripts)
-    ├── subresource-test - sanity checking tests for resource invocation
-    ├── template - the test files template used for generating the tests
-    └── tools -  for generating and maintaining the test suite
-└── (genereated_tests_for_a_specification_1)
-└── (genereated_tests_for_a_specification_2)
-└── ...
-└── (genereated_tests_for_a_specification_N)
-```
-
-## The spec JSON
-
-The ```spec.src.json``` defines all the test scenarios for the referrer policy.
-
-Invoking ```./generic/tools/generate.py``` will parse the spec JSON and determine which tests to generate (or skip) while using templates.
-
-
-The spec can be validated by running ```./generic/tools/spec_validator.py```. This is specially important when you're making changes to  ```spec.src.json```. Make sure it's a valid JSON (no comments or trailing commas). The validator should be informative and very specific on any issues.
-
-For details about the spec JSON, see **Overview of the spec JSON** below.
-
-
-## Generating and running the tests
-
-The repository already contains generated tests, so if you're making changes,
-see the **Removing all generated tests** section below, on how to remove them before you start generating tests which include your changes.
-
-Start from the command line:
-
-```bash
-
-# Chdir into the tests directory.
-cd ~/web-platform-tests/referrer-policy
-
-# Generate the test resources.
-./generic/tools/generate.py
-
-# Add all generated tests to the repo.
-git add * && git commit -m "Add generated tests"
-
-# Regenerate the manifest.
-../manifest
-
-```
-
-Navigate to [http://web-platform.test:8000/tools/runner/index.html](http://web-platform.test:8000/tools/runner/index.html).
-
-Run tests under path: ```/referrer-policy```.
-
-Click start.
-
-
-## Options for generating tests
-
-The generator script ```./generic/tools/generate.py``` has two targets: ```release``` and ```debug```.
-
-* Using **release** for the target will produce tests using a template for optimizing size and performance. The release template is intended for the official web-platform-tests and possibly other test suites. No sanity checking is done in release mode. Use this option whenever you're checking into web-platform-tests.
-
-* When generating for ```debug```, the produced tests will contain more verbosity and sanity checks. Use this target to identify problems with the test suite when making changes locally. Make sure you don't check in tests generated with the debug target.
-
-Note that **release** is the default target when invoking ```generate.py```.
-
-
-## Removing all generated tests
-
-```bash
-# Chdir into the tests directory.
-cd ~/web-platform-tests/referrer-policy
-
-# Remove all generated tests.
-./generic/tools/clean.py
-
-# Remove all generated tests to the repo.
-git add * && git commit -m "Remove generated tests"
-
-# Regenerate the manifest.
-../manifest
-```
-
-**Important:**
-The ```./generic/tools/clean.py``` utility will only work if there is a valid ```spec.src.json``` and previously generated directories match the specification requirement names. So make sure you run ```clean.py``` before you alter the specification section of the spec JSON.
-
-
-## Updating the tests
-
-The main test logic lives in ```./generic/referrer-policy-test-case.js``` with helper functions defined in ```./generic/common.js``` so you should probably start there.
-
-For updating the test suite you will most likely do **a subset** of the following:
-
-* Add a new sub-resource python script to ```./generic/subresource/```,
-  and update the reference to it in ```spec.src.json```.
-
-* 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```.
-
-* Exclude or add some tests by updating ```spec.src.json``` test expansions.
-
-* Update the template files living in ```./generic/template/```.
-
-* Implement a new delivery method via HTTP headers or as part of the test template in  ```./generic/tools/generate.py```
-
-* Update the spec schema by editing ```spec.src.json``` while updating the
-  ```./generic/tools/spec_validator.py``` and ```./generic/tools/generate.py```
-  and making sure both still work after the change (by running them).
-
-* Regenerate the tests and MANIFEST.json
-
-
-## Updating the spec and regenerating
-
-When updating the ```spec.src.json```, e.g. by adding a test expansion pattern to the ```excluded_tests``` section or when removing an expansion in the ```specification``` section, make sure to remove all previously generated files which would still get picked up by ```MANIFEST.json``` in the web-platform-tests root. As long as you don't change the specification requirements' names or remove them, you can easily regenerate the tests via command line:
-
-```bash
-
-# Chdir into the tests directory.
-cd ~/web-platform-tests/referrer-policy
-
-# Regenerate the test resources.
-./generic/tools/regenerate
-
-# Add all the tests to the repo.
-git add * && git commit -m "Update generated tests"
-
-# Regenerate the manifest.
-../manifest
-
-
-```
-
-
-## Overview of the spec JSON
-
-**Main sections:**
-
-* **specification**
-
-  Top level requirements with description fields and a ```test_expansion``` rule.
-  This is closely mimicking the [Referrer Policy specification](http://w3c.github.io/webappsec/specs/referrer-policy/) structure.
-
-* **excluded_tests**
-
-  List of ```test_expansion``` patterns expanding into selections which get skipped when generating the tests (aka. blacklisting/suppressing)
-
-* **referrer_policy_schema**
-
-  The schema to validate fields which define the ```referrer_policy``` elsewhere in the JSON.
-  A value for a referrer_policy can only be one specified in the referrer_policy_schema.
-
-* **test_expansion_schema**
-
-  The schema used to check if a ```test_expansion``` is valid.
-  Each test expansion can only contain fields defined by this schema.
-
-* **subresource_path**
-
-  A 1:1 mapping of a **subresource type** to the URL path of the sub-resource.
-  When adding a new sub-resource, a path to an existing file for it also must be specified.
-
-
-### Test Expansion Patterns
-
-Each field in a test expansion can be in one of the following formats:
-
-* Single match: ```"value"```
-
-* Match any of: ```["value1", "value2", ...]```
-
-* Match all: ```"*"```
-
-#### Example: test expansion in a requirement specification
-
-The following example shows how to restrict the expansion of ```referrer_url``` to  ```origin``` and allow rest of the arrangement to expand (permute) to all possible values. The name field will be the prefix of a generated HTML file name for the test.
-
-```json
-    {
-      "name": "origin-only",
-      "title": "Referrer Policy is set to 'origin-only'",
-      "description": "Check that all sub-resources in all cases get only the origin portion of the referrer URL.",
-      "specification_url": "https://w3c.github.io/webappsec/specs/referrer-policy/#referrer-policy-state-origin",
-      "referrer_policy": "origin",
-      "test_expansion": [
-        {
-          "name": "generic",
-          "expansion": "default",
-          "source_protocol": "*",
-          "target_protocol": "*",
-          "delivery_method": "*",
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "origin"
-        }
-      ]
-    }
-```
-
-**NOTE:** An expansion is always constructive (inclusive), there isn't a negation operator for explicit exclusion. Be aware that using an empty list ```[]``` matches (expands into) exactly nothing. Tests which are to be excluded should be defined in the ```excluded_tests``` section instead.
-
-A single test expansion pattern, be it a requirement or a suppressed pattern, gets expanded into a list of **selections** as follows:
-
-* Expand each field's pattern (single, any of, or all) to list of allowed values (defined by the ```test_expansion_schema```)
-
-* Permute - Recursively enumerate all **selections** accross all fields
-
-Be aware that if there is more than one pattern expanding into a same selection (which also shares the same ```name``` field), the pattern appearing later in the spec JSON will overwrite a previously generated selection. To make sure this is not undetected when generating, set the value of the ```expansion``` field to ```default``` for an expansion appearing earlier and ```override``` for the one appearing later.
-
-A **selection** is a single **test instance** (scenario) with explicit values, for example:
-
-```javascript
-var scenario = {
-  "referrer_policy": "origin-when-cross-origin",
-  "delivery_method": "meta-referrer",
-  "redirection": "no-redirect",
-  "origin": "cross-origin",
-  "source_protocol": "http",
-  "target_protocol": "http",
-  "subresource": "iframe-tag",
-  "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-  "referrer_url": "origin"
-};
-```
-
-Essentially, this is what gets generated and defines a single test. The scenario is then evaluated by the ```ReferrerPolicyTestCase``` in JS. For the rest of the arranging part, see the ```./generic/template/``` directory and examine ```./generic/tools/generate.py``` to see how the values for the templates are produced.
-
-
-Taking the spec JSON, the generator follows this algorithm:
-
-* Expand all ```excluded_tests``` to create a blacklist of selections
-
-* For each specification requirement: Expand the ```test_expansion``` pattern into selections and check each against the blacklist, if not marked as suppresed, generate the test resources for the selection
-
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/common.js b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/common.js
deleted file mode 100644
index 6adf59c0c29..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/common.js
+++ /dev/null
@@ -1,325 +0,0 @@
-// NOTE: This method only strips the fragment and is not in accordance to the
-// recommended draft specification:
-// https://w3c.github.io/webappsec/specs/referrer-policy/#null
-// TODO(kristijanburnik): Implement this helper as defined by spec once added
-// scenarios for URLs containing username/password/etc.
-function stripUrlForUseAsReferrer(url) {
-  return url.replace(/#.*$/, "");
-}
-
-function parseUrlQueryString(queryString) {
-  var queries = queryString.replace(/^\?/, "").split("&");
-  var params = {};
-
-  for (var i in queries) {
-    var kvp = queries[i].split("=");
-    params[kvp[0]] = kvp[1];
-  }
-
-  return params;
-};
-
-function appendIframeToBody(url, attributes) {
-  var iframe = document.createElement("iframe");
-  iframe.src = url;
-  // Extend element with attributes. (E.g. "referrerPolicy" or "rel")
-  if (attributes) {
-    for (var attr in attributes) {
-      iframe[attr] = attributes[attr];
-    }
-  }
-  document.body.appendChild(iframe);
-
-  return iframe;
-}
-
-function loadImage(src, callback, attributes) {
-  var image = new Image();
-  image.crossOrigin = "Anonymous";
-  image.onload = function() {
-    callback(image);
-  }
-  image.src = src;
-  // Extend element with attributes. (E.g. "referrerPolicy" or "rel")
-  if (attributes) {
-    for (var attr in attributes) {
-      image[attr] = attributes[attr];
-    }
-  }
-  document.body.appendChild(image)
-}
-
-function decodeImageData(rgba) {
-  var rgb = new Uint8ClampedArray(rgba.length);
-
-  // RGBA -> RGB.
-  var rgb_length = 0;
-  for (var i = 0; i < rgba.length; ++i) {
-    // Skip alpha component.
-    if (i % 4 == 3)
-      continue;
-
-    // Zero is the string terminator.
-    if (rgba[i] == 0)
-      break;
-
-    rgb[rgb_length++] = rgba[i];
-  }
-
-  // Remove trailing nulls from data.
-  rgb = rgb.subarray(0, rgb_length);
-  var string_data = (new TextDecoder("ascii")).decode(rgb);
-
-  return JSON.parse(string_data);
-}
-
-function decodeImage(url, callback, referrer_policy) {
-  loadImage(url, function(img) {
-    var canvas = document.createElement("canvas");
-    var context = canvas.getContext('2d');
-    context.drawImage(img, 0, 0);
-    var imgData = context.getImageData(0, 0, img.clientWidth, img.clientHeight);
-    callback(decodeImageData(imgData.data))
-  }, referrer_policy);
-}
-
-function normalizePort(targetPort) {
-  var defaultPorts = [80, 443];
-  var isDefaultPortForProtocol = (defaultPorts.indexOf(targetPort) >= 0);
-
-  return (targetPort == "" || isDefaultPortForProtocol) ?
-          "" : ":" + targetPort;
-}
-
-function wrapResult(url, server_data) {
-  return {
-    location: url,
-    referrer: server_data.headers.referer,
-    headers: server_data.headers
-  }
-}
-
-function queryIframe(url, callback, referrer_policy) {
-  var x = document.createElement('script');
-  x.src = '/common/utils.js';
-  x.onerror = function() { console.log('whoops') };
-  x.onload = function() { doQuery() };
-  document.getElementsByTagName("head")[0].appendChild(x);
-
-  function doQuery() {
-    var id = token();
-    var iframe = appendIframeToBody(url + "&id=" + id, referrer_policy);
-    iframe.addEventListener("load", function listener() {
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', '/_mozilla/mozilla/referrer-policy/generic/subresource/stash.py?id=' + id, false);
-      xhr.onload = function(e) {
-        var server_data = JSON.parse(this.responseText);
-        callback(server_data);
-      };
-      xhr.send();
-      iframe.removeEventListener("load", listener);
-    });
-  }
-}
-
-function queryImage(url, callback, referrer_policy) {
-  decodeImage(url, function(server_data) {
-    callback(wrapResult(url, server_data), url);
-  }, referrer_policy)
-}
-
-function queryXhr(url, callback) {
-  var xhr = new XMLHttpRequest();
-  xhr.open('GET', url, true);
-  xhr.onload = function(e) {
-    var server_data = JSON.parse(this.responseText);
-    callback(wrapResult(url, server_data), url);
-  };
-  xhr.send();
-}
-
-function queryWorker(url, callback) {
-  var worker = new Worker(url);
-  worker.onmessage = function(event) {
-    var server_data = event.data;
-    callback(wrapResult(url, server_data), url);
-  };
-}
-
-function queryFetch(url, callback) {
-  fetch(url).then(function(response) {
-      response.json().then(function(server_data) {
-        callback(wrapResult(url, server_data), url);
-      });
-    }
-  );
-}
-
-function queryNavigable(element, url, callback, attributes) {
-  var navigable = element
-  navigable.href = url;
-  navigable.target = "helper-iframe";
-
-  var helperIframe = document.createElement("iframe")
-  helperIframe.name = "helper-iframe"
-  document.body.appendChild(helperIframe)
-
-  // Extend element with attributes. (E.g. "referrer_policy" or "rel")
-  if (attributes) {
-    for (var attr in attributes) {
-      navigable[attr] = attributes[attr];
-    }
-  }
-
-  var listener = function(event) {
-    if (event.source != helperIframe.contentWindow)
-      return;
-
-    callback(event.data, url);
-    window.removeEventListener("message", listener);
-  }
-  window.addEventListener("message", listener);
-
-  navigable.click();
-}
-
-function queryAnchor(url, callback, referrer_policy) {
-  var x = document.createElement('script');
-  x.src = '/common/utils.js';
-  x.onerror = function() { console.log('whoops') };
-  x.onload = function() { doQuery() };
-  document.getElementsByTagName("head")[0].appendChild(x);
-
-  function doQuery() {
-    var id = token();
-
-    var document_url = new URL(url);
-    var document_protocol = document_url.protocol;
-    var document_host = document_url.host;
-
-    // TODO This is a workaround to pass tests which their referrer policy
-    // changed when source and destination has different protocol or host.
-    //
-    // Here we store url's protocol and host, then make url's protocol and
-    // host equal to window's. Finally, we pass the protocol and host we
-    // stored as url arguments while loading url. So that url knows what
-    // protocol and host to load the actual document.py and makes tests
-    // meaningful and correct.
-    document_url.protocol = window.location.protocol;
-    document_url.host = window.location.host;
-
-    // Due to limitation of current test implementation, we are unable to
-    // capture referrer policy from meta tags and http header of test
-    // harness directly. To overcome it, we extract these information from
-    // meta tags and pass it to url which we're going to load for future
-    // use.
-    var meta_referrer = undefined;
-    var http_referrer = undefined;
-    for (var meta of document.head.querySelectorAll("meta")) {
-      if (meta.name === "referrer") {
-        meta_referrer = meta.content;
-      } else if (meta.name === "http-referrer-policy") {
-        http_referrer = meta.content;
-      }
-    }
-
-    var url_with_params = document_url.toString() +
-      "&id=" + id +
-      "&tagAttrs=" + JSON.stringify(referrer_policy) +
-      "&metaReferrer=" + meta_referrer +
-      "&httpReferrer=" + http_referrer +
-      "&protocol=" + document_protocol +
-      "&host=" + document_host;
-
-    var iframe = appendIframeToBody(url_with_params);
-    iframe.addEventListener("load", function listener() {
-      if ((iframe.contentDocument !== null) &&
-          (iframe.contentDocument.location.toString() === url_with_params)) {
-        return;
-      }
-
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', '/_mozilla/mozilla/referrer-policy/generic/subresource/stash.py?path=a-tag-document-url&id=' + id, false);
-      xhr.send();
-      var expected_url = JSON.parse(xhr.responseText);
-
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', '/_mozilla/mozilla/referrer-policy/generic/subresource/stash.py?id=' + id, false);
-      xhr.onload = function(e) {
-        var server_data = JSON.parse(this.responseText);
-
-        callback(server_data, expected_url);
-      };
-      xhr.send();
-
-      iframe.removeEventListener("load", listener);
-    });
-  }
-}
-
-function queryAreaLink(url, callback, referrer_policy) {
-  var area = document.createElement("area");
-  // TODO(kristijanburnik): Append to map and add image.
-  document.body.appendChild(area);
-  queryNavigable(area, url, callback, referrer_policy)
-}
-
-function queryScript(url, callback) {
-  var script = document.createElement("script");
-  script.src = url;
-
-  var listener = function(event) {
-    var server_data = event.data;
-    callback(wrapResult(url, server_data), url);
-    window.removeEventListener("message", listener);
-  }
-  window.addEventListener("message", listener);
-
-  document.body.appendChild(script);
-}
-
-function queryLink(url, callback, referrer_policy) {
-  var x = document.createElement('script');
-  x.src = '/common/utils.js';
-  x.onerror = function() { console.log('whoops') };
-  x.onload = function() { doQuery() };
-  document.getElementsByTagName("head")[0].appendChild(x);
-
-  function doQuery() {
-    var id = token();
-    var link = document.createElement("link");
-
-    for (var attr in referrer_policy) {
-      link[attr] = referrer_policy[attr];
-    }
-
-    link.href = url + "&id=" + id;
-    link.relList.add("stylesheet");
-
-    link.onload = function() {
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', '/_mozilla/mozilla/referrer-policy/generic/subresource/stash.py?path=link-element-stash&id=' + id, false);
-      xhr.onload = function(e) {
-        var server_data = JSON.parse(this.responseText);
-        server_data.headers = JSON.parse(server_data.headers);
-        if (server_data.headers.referer == undefined) {
-          server_data.headers.referer = undefined;
-        }
-
-        callback(wrapResult(url, server_data));
-      };
-      xhr.send();
-    };
-
-    document.body.appendChild(link);
-  }
-}
-
- // SanityChecker does nothing in release mode.
-function SanityChecker() {}
-SanityChecker.prototype.checkScenario = function() {};
-SanityChecker.prototype.checkSubresourceResult = function() {};
-
-// TODO(kristijanburnik): document.origin is supported since Chrome 41,
-// other browsers still don't support it. Remove once they do.
-document.origin = document.origin || (location.protocol + "//" + location.host);
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/referrer-policy-test-case.js b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/referrer-policy-test-case.js
deleted file mode 100644
index 2d676c40b23..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/referrer-policy-test-case.js
+++ /dev/null
@@ -1,140 +0,0 @@
-function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
-  // Pass and skip rest of the test if browser does not support fetch.
-  if (scenario.subresource == "fetch-request" && !window.fetch) {
-    // TODO(kristijanburnik): This should be refactored.
-    return {
-      start: function() {
-        test(function() { assert_true(true); },
-             "[ReferrerPolicyTestCase] Skipping test: Fetch is not supported.");
-      }
-    };
-  }
-
-  // This check is A NOOP in release.
-  sanityChecker.checkScenario(scenario);
-
-  var subresourceInvoker = {
-    "a-tag": queryAnchor,
-    "area-tag": queryAreaLink,
-    "fetch-request": queryFetch,
-    "iframe-tag": queryIframe,
-    "img-tag":  queryImage,
-    "script-tag": queryScript,
-    "worker-request": queryWorker,
-    "xhr-request": queryXhr,
-    "link-tag": queryLink
-  };
-
-  var referrerUrlResolver = {
-    "omitted": function() {
-      return undefined;
-    },
-    "origin": function() {
-      return document.origin + "/";
-    },
-    "stripped-referrer": function() {
-      return stripUrlForUseAsReferrer(location.toString());
-    }
-  };
-
-  var t = {
-    _scenario: scenario,
-    _testDescription: testDescription,
-    _subresourceUrl: null,
-    _expectedReferrerUrl: null,
-    _constructSubresourceUrl: function() {
-      // TODO(kristijanburnik): We should assert that these two domains are
-      // different. E.g. If someone runs the tets over www, this would fail.
-      var domainForOrigin = {
-        "cross-origin":"{{domains[www1]}}",
-        "same-origin": location.hostname
-      };
-
-      // Values obtained and replaced by the wptserve pipeline:
-      // http://wptserve.readthedocs.org/en/latest/pipes.html#built-in-pipes
-      var portForProtocol = {
-        "http": parseInt("{{ports[http][0]}}"),
-        "https": parseInt("{{ports[https][0]}}")
-      }
-
-      var targetPort = portForProtocol[t._scenario.target_protocol];
-
-      t._subresourceUrl = t._scenario.target_protocol + "://" +
-                          domainForOrigin[t._scenario.origin] +
-                          normalizePort(targetPort) +
-                          t._scenario["subresource_path"] +
-                          "?redirection=" + t._scenario["redirection"] +
-                          "&cache_destroyer=" + (new Date()).getTime();
-    },
-
-    _constructExpectedReferrerUrl: function() {
-      t._expectedReferrerUrl = referrerUrlResolver[t._scenario.referrer_url]();
-    },
-
-    _invokeSubresource: function(callback) {
-      var invoker = subresourceInvoker[t._scenario.subresource];
-
-      // Depending on the delivery method, extend the subresource element with
-      // these attributes.
-      var elementAttributesForDeliveryMethod = {
-        "attr-referrer":  {referrerPolicy: t._scenario.referrer_policy},
-        "rel-noreferrer": {rel: "noreferrer"}
-      };
-
-      var delivery_method = t._scenario.delivery_method;
-
-      if (delivery_method in elementAttributesForDeliveryMethod) {
-        invoker(t._subresourceUrl,
-                callback,
-                elementAttributesForDeliveryMethod[delivery_method]);
-      } else {
-        invoker(t._subresourceUrl, callback);
-      }
-
-    },
-
-    start: function() {
-      t._constructSubresourceUrl();
-      t._constructExpectedReferrerUrl();
-
-      var test = async_test(t._testDescription);
-
-      // FIXME Pass value to `expected_referrer` only if there's some
-      //       technical restrictions to pass (eg. postMessage is not
-      //       available).
-      t._invokeSubresource(function(result, expected_referrer) {
-        // Check if the result is in valid format. NOOP in release.
-        sanityChecker.checkSubresourceResult(
-            test, t._scenario, t._subresourceUrl, result);
-
-        // Check the reported URL.
-        test.step(function() {
-          if (expected_referrer) {
-            expected_referrer = new URL(expected_referrer);
-            if (t._scenario.referrer_url === "omitted") {
-              expected_referrer = undefined;
-            } else if (t._scenario.referrer_url === "origin") {
-              expected_referrer = expected_referrer.origin + "/";
-            } else if (t._scenario.referrer_url === "stripped-referrer") {
-              expected_referrer = stripUrlForUseAsReferrer(expected_referrer.toString());
-            }
-          }
-
-          expected_referrer = expected_referrer || t._expectedReferrerUrl;
-
-          assert_equals(result.referrer,
-                        expected_referrer,
-                        "Reported Referrer URL is '" + expected_referrer + "'.");
-          assert_equals(result.headers.referer,
-                        expected_referrer,
-                        "Reported Referrer URL from HTTP header is '" + expected_referrer + "'");
-        }, "Reported Referrer URL is as expected: " + (expected_referrer || t._expectedReferrerUrl));
-
-        test.done();
-      })
-
-    }
-  }
-
-  return t;
-}
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/sanity-checker.js b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/sanity-checker.js
deleted file mode 100644
index e0714885ffc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/sanity-checker.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// The SanityChecker is used in debug mode to identify problems with the
-// structure of the testsuite. In release mode it is mocked out to do nothing.
-
-function SanityChecker()  {}
-
-SanityChecker.prototype.checkScenario = function(scenario) {
-  // Check if scenario is valid.
-  // TODO(kristijanburnik): Move to a sanity-checks.js for debug mode only.
-  test(function() {
-
-    // We extend the exsiting test_expansion_schema not to kill performance by
-    // copying.
-    var expectedFields = SPEC_JSON["test_expansion_schema"];
-    expectedFields["referrer_policy"] = SPEC_JSON["referrer_policy_schema"];
-
-    assert_own_property(scenario, "subresource_path",
-                        "Scenario has the path to the subresource.");
-
-    for (var field in expectedFields) {
-      assert_own_property(scenario, field,
-                          "The scenario contains field " + field)
-      assert_in_array(scenario[field], expectedFields[field],
-                      "Scenario's " + field + " is one of: " +
-                      expectedFields[field].join(", ")) + "."
-    }
-
-    // Check if the protocol is matched.
-    assert_equals(scenario["source_protocol"] + ":", location.protocol,
-                  "Protocol of the test page should match the scenario.")
-
-  }, "[ReferrerPolicyTestCase] The test scenario is valid.");
-}
-
-SanityChecker.prototype.checkSubresourceResult = function(test,
-                                                          scenario,
-                                                          subresourceUrl,
-                                                          result) {
-  test.step(function() {
-    assert_equals(Object.keys(result).length, 3);
-    assert_own_property(result, "location");
-    assert_own_property(result, "referrer");
-    assert_own_property(result, "headers");
-
-    // Skip location check for scripts.
-    if (scenario.subresource == "script-tag")
-      return;
-
-    // Sanity check: location of sub-resource matches reported location.
-    assert_equals(result.location, subresourceUrl,
-                  "Subresource reported location.");
-  }, "Running a valid test scenario.");
-};
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/__init__.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/__init__.py
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.html
deleted file mode 100644
index 8f8b8da6497..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-  </head>
-  <body>
-    <script>
-      var url = new URL(window.location.toString());
-      var id = url.searchParams.get("id");
-
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', 'stash.py?path=a-tag-stash&id=' + id, false);
-      xhr.send();
-      params = JSON.parse(xhr.responseText);
-
-      var xhr = new XMLHttpRequest();
-      xhr.open('POST', 'stash.py?path=a-tag-document-url&id=' + id, false);
-      xhr.send(JSON.stringify(window.location.toString()));
-
-      var redirection = params["redirection"];
-      var cache_destroyer = params["cache_destroyer"];
-      var tag_attrs = params["tagAttrs"];
-      var meta_referrer = params["metaReferrer"];
-      var protocol = params["protocol"];
-      var host = params["host"];
-
-      var referrer_policy;
-      try {
-        referrer_policy = JSON.parse(tag_attrs);
-      } catch(e) {
-        referrer_policy = {};
-      }
-
-      if (meta_referrer !== "undefined") {
-        var meta = document.createElement("meta");
-        meta.name = "referrer";
-        meta.content = meta_referrer;
-
-        document.head.appendChild(meta);
-      }
-
-      var a = document.createElement("a");
-      a.href = protocol + "//" + host +
-        "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py" +
-        "?id=" + id +
-        "&redirection=" + redirection +
-        "&cache_destroyer=" + cache_destroyer;
-
-      // referrer_policy could be:
-      // {rel: "noreferrer"}, or
-      // {referrerPolicy: "POLICY_YOU_CHOOSE"}
-      for (var attr in referrer_policy) {
-          a[attr] = referrer_policy[attr];
-      }
-
-      document.body.appendChild(a);
-
-      a.click();
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.py
deleted file mode 100644
index 24330e4f3c2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/a-tag.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os, json, sys
-this_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, this_dir)
-
-import mozresource; subresource = mozresource
-
-def generate_payload(server_data):
-    with open(os.path.join(this_dir, "a-tag.html")) as f:
-        return f.read()
-
-def main(request, response):
-    path = 'a-tag-stash'
-    server_data = json.dumps(request.GET)
-    stashed_data = request.server.stash.take(request.GET["id"], path)
-    if stashed_data:
-        server_data = stashed_data
-    request.server.stash.put(request.GET["id"], server_data, path)
-    http_header_referrer_policy = request.GET["httpReferrer"] if "httpReferrer" in request.GET else None
-    subresource.respond(request,
-                        response,
-                        payload_generator = generate_payload,
-                        http_header_referrer_policy = http_header_referrer_policy)
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/document.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/document.py
deleted file mode 100644
index 0c627780dd8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/document.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os, json, sys
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
-import mozresource; subresource = mozresource
-
-def generate_payload(server_data):
-    return subresource.get_template("document.html.template") % server_data
-
-def main(request, response):
-    subresource.respond(request,
-                        response,
-                        payload_generator = generate_payload)
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/link.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/link.py
deleted file mode 100644
index 362e78bd4bf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/link.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import os, json, sys, urllib2, urlparse
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
-import mozresource; subresource = mozresource
-
-def generate_payload(server_data):
-    return subresource.get_template("css.template") % server_data
-
-def main(request, response):
-    # TODO: When HTMLLinkElement.sheet is available, don't need this
-    # workaround anymore. We could store data into css.template and
-    # read it from HTMLLinkElement.sheet.
-    path = 'link-element-stash'
-    server_data = {"headers": json.dumps(request.headers, indent = 4)}
-
-    # We do this because in those tests which cause redirection, this
-    # subresource will be called at least twice. And putting data onto stash
-    # more than once is not a valid operation (it'll throw exception). When
-    # there's already something in stash, we simply take it out and put the
-    # new one back since we only interesting in the last request.
-    stashed_data = request.server.stash.take(request.GET["id"], path)
-
-    request.server.stash.put(request.GET["id"], json.dumps(server_data), path)
-
-    subresource.respond(request,
-                        response,
-                        payload_generator = generate_payload)
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/mozresource.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/mozresource.py
deleted file mode 100644
index 763062ce52c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/mozresource.py
+++ /dev/null
@@ -1,99 +0,0 @@
-import os, sys, json, urlparse, urllib
-
-def get_template(template_basename):
-    script_directory = os.path.dirname(os.path.abspath(__file__))
-    template_directory = os.path.abspath(os.path.join(script_directory,
-                                                      "..",
-                                                      "template"))
-    template_filename = os.path.join(template_directory, template_basename);
-
-    with open(template_filename) as f:
-        return f.read()
-
-# TODO(kristijanburnik): subdomain_prefix is a hardcoded value aligned with
-# referrer-policy-test-case.js. The prefix should be configured in one place.
-def get_swapped_origin_netloc(netloc, subdomain_prefix = "www1."):
-    if netloc.startswith(subdomain_prefix):
-        return netloc[len(subdomain_prefix):]
-    else:
-        return subdomain_prefix + netloc
-
-def create_redirect_url(request, cross_origin = False):
-    parsed = urlparse.urlsplit(request.url)
-    destination_netloc = parsed.netloc
-    if cross_origin:
-        destination_netloc = get_swapped_origin_netloc(parsed.netloc)
-
-    query = filter(lambda x: not x.startswith('redirection='), parsed.query.split('&'))
-    destination_url = urlparse.urlunsplit(urlparse.SplitResult(
-        scheme = parsed.scheme,
-        netloc = destination_netloc,
-        path = parsed.path,
-        query = '&'.join(query),
-        fragment = None))
-
-    return destination_url
-
-
-def redirect(url, response):
-    response.add_required_headers = False
-    response.writer.write_status(301)
-    response.writer.write_header("access-control-allow-origin", "*")
-    response.writer.write_header("location", url)
-    response.writer.end_headers()
-    response.writer.write("")
-
-
-def preprocess_redirection(request, response):
-    if "redirection" not in request.GET:
-        return False
-
-    redirection = request.GET["redirection"]
-
-    if redirection == "no-redirect":
-        return False
-    elif redirection == "keep-origin-redirect":
-        redirect_url = create_redirect_url(request, cross_origin = False)
-    elif redirection == "swap-origin-redirect":
-        redirect_url = create_redirect_url(request, cross_origin = True)
-    else:
-        raise ValueError("Invalid redirection type '%s'" % redirection)
-
-    redirect(redirect_url, response)
-    return True
-
-
-def __noop(request, response):
-    return ""
-
-
-def respond(request,
-            response,
-            status_code = 200,
-            content_type = "text/html",
-            payload_generator = __noop,
-            cache_control = "no-cache; must-revalidate",
-            access_control_allow_origin = "*",
-            http_header_referrer_policy = None):
-    if preprocess_redirection(request, response):
-        return
-
-    response.add_required_headers = False
-    response.writer.write_status(status_code)
-
-    if access_control_allow_origin != None:
-        response.writer.write_header("access-control-allow-origin",
-                                     access_control_allow_origin)
-    if http_header_referrer_policy != None:
-        response.writer.write_header("referrer-policy",
-                                     http_header_referrer_policy)
-    response.writer.write_header("content-type", content_type)
-    response.writer.write_header("cache-control", cache_control)
-    response.writer.end_headers()
-
-    server_data = {"headers": json.dumps(request.headers, indent = 4)}
-
-    payload = payload_generator(server_data)
-    response.writer.write(payload)
-
-
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/stash.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/stash.py
deleted file mode 100644
index 9be57acbdad..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/subresource/stash.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def main(request, response):
-    path = request.GET["path"] if "path" in request.GET else None
-    if request.method == 'POST':
-         request.server.stash.put(request.GET["id"], request.body, path)
-         return ''
-
-    return request.server.stash.take(request.GET["id"], path)
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/css.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/css.template
deleted file mode 100644
index 30021bc8130..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/css.template
+++ /dev/null
@@ -1,3 +0,0 @@
-h1 {
-  content: "%(headers)s";
-}
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/disclaimer.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/disclaimer.template
deleted file mode 100644
index 66c43ed6f21..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/disclaimer.template
+++ /dev/null
@@ -1 +0,0 @@
-<!-- DO NOT EDIT! Generated by %(generating_script_filename)s using %(html_template_filename)s. -->
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/document.html.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/document.html.template
deleted file mode 100644
index fa2baa63cf8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/document.html.template
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>This page reports back it's request details to the parent frame</title>
-  </head>
-  <body>
-    <script>
-      function getQueryVariable(variable)
-      {
-             var query = window.location.search.substring(1);
-             var vars = query.split("&");
-             for (var i=0;i<vars.length;i++) {
-                     var pair = vars[i].split("=");
-                     if(pair[0] == variable){return pair[1];}
-             }
-             return(false);
-      }
-
-      var referrer = document.referrer.length > 0 ? document.referrer : undefined;
-
-      var result = {
-        location: document.location.toString(),
-        referrer: referrer,
-        headers: %(headers)s
-      };
-      var xhr = new XMLHttpRequest();
-      xhr.open('POST', 'stash.py?id=' + getQueryVariable("id"), false);
-      xhr.send(JSON.stringify(result));
-
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/script.js.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/script.js.template
deleted file mode 100644
index e2edf21819d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/script.js.template
+++ /dev/null
@@ -1,3 +0,0 @@
-postMessage({
-  "headers": %(headers)s
-}, "*");
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/spec_json.js.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/spec_json.js.template
deleted file mode 100644
index e4cbd034259..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/spec_json.js.template
+++ /dev/null
@@ -1 +0,0 @@
-var SPEC_JSON = %(spec_json)s;
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.debug.html.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.debug.html.template
deleted file mode 100644
index a92e460e934..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.debug.html.template
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-%(generated_disclaimer)s
-<html>
-  <head>
-    <title>Referrer-Policy: %(spec_title)s</title>%(meta_delivery_method)s
-    <meta name="description" content="%(spec_description)s">
-    <meta name="assert" content="%(test_description)s">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- Common global functions for referrer-policy tests. -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <!-- The original specification JSON for validating the scenario. -->
-    <script src="/_mozilla/mozilla/referrer-policy/spec_json.js"></script>
-    <!-- Internal checking of the tests -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/sanity-checker.js"></script>
-    <!-- Simple wrapper API for all referrer-policy test cases. -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <h1>%(spec_title)s</h1>
-    <h2>%(spec_description)s</h2>
-
-    <p>
-      <script>
-        // Show the detailed assertion description of the test.
-        document.write(document.querySelector("meta[name=assert]").content);
-      </script>
-    </p>
-
-    <p>See <a href="%(spec_specification_url)s" target="_blank">specification</a>
-       details for this test.</p>
-
-    <h3>Scenario outline</h3>
-    <table>
-      <tbody>
-        <tr>
-          <th>Delivery method</th>
-          <td>%(delivery_method)s</td>
-        </tr>
-        <tr>
-          <th>Redirection</th>
-          <td>%(redirection)s</td>
-        </tr>
-        <tr>
-          <th>Origin transition</th>
-          <td>%(origin)s</td>
-        </tr>
-        <tr>
-          <th>Protocol transition</th>
-          <td>from %(source_protocol)s to %(target_protocol)s</td>
-        </tr>
-        <tr>
-          <th>Subresource type</th>
-          <td>%(subresource)s</td>
-        </tr>
-        <tr>
-          <td colspan="2"><hr></td>
-        </tr>
-        <tr>
-          <th>Expected result</th>
-          <td>Referrer URL should be <strong>%(referrer_url)s</strong></td>
-        </tr>
-      <tbody>
-    </table>
-
-    <script>%(test_js)s</script>
-
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.js.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.js.template
deleted file mode 100644
index 4b01d4d113a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.js.template
+++ /dev/null
@@ -1,15 +0,0 @@
-ReferrerPolicyTestCase(
-  {
-    "referrer_policy": %(referrer_policy_json)s,
-    "delivery_method": "%(delivery_method)s",
-    "redirection": "%(redirection)s",
-    "origin": "%(origin)s",
-    "source_protocol": "%(source_protocol)s",
-    "target_protocol": "%(target_protocol)s",
-    "subresource": "%(subresource)s",
-    "subresource_path": "%(subresource_path)s",
-    "referrer_url": "%(referrer_url)s"
-  },
-  document.querySelector("meta[name=assert]").content,
-  new SanityChecker()
-).start();
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.release.html.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.release.html.template
deleted file mode 100644
index b2523fb045d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test.release.html.template
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-%(generated_disclaimer)s
-<html>
-  <head>
-    <title>Referrer-Policy: %(spec_title)s</title>
-    <meta name="description" content="%(spec_description)s">%(meta_delivery_method)s
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="%(spec_specification_url)s">
-    <meta name="assert" content="%(test_description)s">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>%(test_js)s</script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test_description.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test_description.template
deleted file mode 100644
index fbc80bb25af..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/test_description.template
+++ /dev/null
@@ -1,5 +0,0 @@
-The referrer URL is %(referrer_url)s when a
-document served over %(source_protocol)s requires an %(target_protocol)s
-sub-resource via %(subresource)s using the %(delivery_method)s
-delivery method with %(redirection)s and when
-the target request is %(origin)s.
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/worker.js.template b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/worker.js.template
deleted file mode 100644
index 817dd8c87ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/template/worker.js.template
+++ /dev/null
@@ -1,3 +0,0 @@
-postMessage({
-  "headers": %(headers)s
-});
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/__init__.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/clean.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/clean.py
deleted file mode 100755
index 715e1d6ae4b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/clean.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-
-import os, json
-from common_paths import *
-import spec_validator
-
-def rmtree(top):
-    top = os.path.abspath(top)
-    assert top != os.path.expanduser("~")
-    assert len(top) > len(os.path.expanduser("~"))
-    assert "web-platform-tests" in top
-    assert "referrer-policy" in top
-
-    for root, dirs, files in os.walk(top, topdown=False):
-        for name in files:
-            os.remove(os.path.join(root, name))
-        for name in dirs:
-            os.rmdir(os.path.join(root, name))
-
-    os.rmdir(top)
-
-def main():
-    spec_json = load_spec_json();
-    spec_validator.assert_valid_spec_json(spec_json)
-
-    for spec in spec_json['specification']:
-        generated_dir = os.path.join(spec_directory, spec["name"])
-        if (os.path.isdir(generated_dir)):
-            rmtree(generated_dir)
-
-    if (os.path.isfile(generated_spec_json_filename)):
-        os.remove(generated_spec_json_filename)
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/common_paths.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/common_paths.py
deleted file mode 100644
index 4626223c4c5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/common_paths.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import os, sys, json, re
-
-script_directory = os.path.dirname(os.path.abspath(__file__))
-generic_directory = os.path.abspath(os.path.join(script_directory, '..'))
-
-template_directory = os.path.abspath(os.path.join(script_directory,
-                                                  '..',
-                                                  'template'))
-spec_directory = os.path.abspath(os.path.join(script_directory, '..', '..'))
-test_root_directory = os.path.abspath(os.path.join(script_directory,
-                                                   '..', '..', '..'))
-
-spec_filename = os.path.join(spec_directory, "spec.src.json")
-generated_spec_json_filename = os.path.join(spec_directory, "spec_json.js")
-
-selection_pattern = '%(delivery_method)s/' + \
-                    '%(origin)s/' + \
-                    '%(source_protocol)s-%(target_protocol)s/' + \
-                    '%(subresource)s/'
-
-test_file_path_pattern = '%(spec_name)s/' + selection_pattern + \
-                         '%(name)s.%(redirection)s.%(source_protocol)s.html'
-
-
-def get_template(basename):
-    with open(os.path.join(template_directory, basename)) as f:
-        return f.read()
-
-
-def read_nth_line(fp, line_number):
-  fp.seek(0)
-  for i, line in enumerate(fp):
-    if (i + 1) == line_number:
-      return line
-
-
-def load_spec_json():
-    re_error_location = re.compile('line ([0-9]+) column ([0-9]+)')
-    with open(spec_filename) as f:
-        try:
-          spec_json = json.load(f)
-        except ValueError, ex:
-          print ex.message
-          match = re_error_location.search(ex.message)
-          if match:
-            line_number, column = int(match.group(1)), int(match.group(2))
-            print read_nth_line(f, line_number).rstrip()
-            print " " * (column - 1) + "^"
-
-          sys.exit(1)
-
-        return spec_json
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/generate.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/generate.py
deleted file mode 100755
index 627133bf6bc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/generate.py
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/env python
-
-import os, sys, json
-from common_paths import *
-import spec_validator
-import argparse
-
-
-def expand_test_expansion_pattern(spec_test_expansion, test_expansion_schema):
-    expansion = {}
-    for artifact in spec_test_expansion:
-        artifact_value = spec_test_expansion[artifact]
-        if artifact_value == '*':
-            expansion[artifact] = test_expansion_schema[artifact]
-        elif isinstance(artifact_value, list):
-            expansion[artifact] = artifact_value
-        else:
-            expansion[artifact] = [artifact_value]
-
-    return expansion
-
-
-def permute_expansion(expansion, selection = {}, artifact_index = 0):
-    artifact_order = ['delivery_method', 'redirection', 'origin',
-                      'source_protocol', 'target_protocol', 'subresource',
-                      'referrer_url', 'name']
-
-    if artifact_index >= len(artifact_order):
-        yield selection
-        return
-
-    artifact_key = artifact_order[artifact_index]
-
-    for artifact_value in expansion[artifact_key]:
-        selection[artifact_key] = artifact_value
-        for next_selection in permute_expansion(expansion,
-                                                selection,
-                                                artifact_index + 1):
-            yield next_selection
-
-
-def generate_selection(selection, spec, subresource_path,
-                       test_html_template_basename):
-    selection['spec_name'] = spec['name']
-    selection['spec_title'] = spec['title']
-    selection['spec_description'] = spec['description']
-    selection['spec_specification_url'] = spec['specification_url']
-    selection['subresource_path'] = subresource_path
-    # Oddball: it can be None, so in JS it's null.
-    selection['referrer_policy_json'] = json.dumps(spec['referrer_policy'])
-
-    test_filename = test_file_path_pattern % selection
-    test_directory = os.path.dirname(test_filename)
-    full_path = os.path.join(spec_directory, test_directory)
-
-    test_html_template = get_template(test_html_template_basename)
-    test_js_template = get_template("test.js.template")
-    disclaimer_template = get_template('disclaimer.template')
-    test_description_template = get_template("test_description.template")
-
-    html_template_filename = os.path.join(template_directory,
-                                          test_html_template_basename)
-    generated_disclaimer = disclaimer_template \
-        % {'generating_script_filename': os.path.relpath(__file__,
-                                                         test_root_directory),
-           'html_template_filename': os.path.relpath(html_template_filename,
-                                                     test_root_directory)}
-
-    # Adjust the template for the test invoking JS. Indent it to look nice.
-    selection['generated_disclaimer'] = generated_disclaimer.rstrip()
-    test_description_template = \
-        test_description_template.rstrip().replace("\n", "\n" + " " * 33)
-    selection['test_description'] = test_description_template % selection
-
-    # Adjust the template for the test invoking JS. Indent it to look nice.
-    indent = "\n" + " " * 6;
-    test_js_template = indent + test_js_template.replace("\n", indent);
-    selection['test_js'] = test_js_template % selection
-
-    # Directory for the test files.
-    try:
-        os.makedirs(full_path)
-    except:
-        pass
-
-    selection['meta_delivery_method'] = ''
-
-    if spec['referrer_policy'] != None:
-        if selection['delivery_method'] == 'meta-referrer':
-            selection['meta_delivery_method'] = \
-                '<meta name="referrer" content="%(referrer_policy)s">' % spec
-        elif selection['delivery_method'] == 'meta-csp':
-            selection['meta_delivery_method'] = \
-                '<meta http-equiv="Content-Security-Policy" ' + \
-                'content="referrer %(referrer_policy)s">' % spec
-        elif selection['delivery_method'] == 'http-rp':
-            selection['meta_delivery_method'] = \
-                '<!-- No meta: Referrer policy delivered via HTTP headers. -->' \
-                '<meta name="http-referrer-policy" content="%(referrer_policy)s">' % spec
-            test_headers_filename = test_filename + ".headers"
-            with open(test_headers_filename, "w") as f:
-                f.write('Referrer-Policy: ' + \
-                        '%(referrer_policy)s\n' % spec)
-                # TODO(kristijanburnik): Limit to WPT origins.
-                f.write('Access-Control-Allow-Origin: *\n')
-        elif selection['delivery_method'] == 'attr-referrer':
-            # attr-referrer is supported by the JS test wrapper.
-            pass
-        elif selection['delivery_method'] == 'rel-noreferrer':
-            # rel=noreferrer is supported by the JS test wrapper.
-            pass
-        else:
-            raise ValueError('Not implemented delivery_method: ' \
-                              + selection['delivery_method'])
-
-    # Obey the lint and pretty format.
-    if len(selection['meta_delivery_method']) > 0:
-        selection['meta_delivery_method'] = "\n    " + \
-                                            selection['meta_delivery_method']
-
-    with open(test_filename, 'w') as f:
-        f.write(test_html_template % selection)
-
-
-def generate_test_source_files(spec_json, target):
-    test_expansion_schema = spec_json['test_expansion_schema']
-    specification = spec_json['specification']
-
-    spec_json_js_template = get_template('spec_json.js.template')
-    with open(generated_spec_json_filename, 'w') as f:
-        f.write(spec_json_js_template
-                % {'spec_json': json.dumps(spec_json)})
-
-    # Choose a debug/release template depending on the target.
-    html_template = "test.%s.html.template" % target
-
-    # Create list of excluded tests.
-    exclusion_dict = {}
-    for excluded_pattern in spec_json['excluded_tests']:
-        excluded_expansion = \
-            expand_test_expansion_pattern(excluded_pattern,
-                                          test_expansion_schema)
-        for excluded_selection in permute_expansion(excluded_expansion):
-            excluded_selection_path = selection_pattern % excluded_selection
-            exclusion_dict[excluded_selection_path] = True
-
-    for spec in specification:
-        for spec_test_expansion in spec['test_expansion']:
-            expansion = expand_test_expansion_pattern(spec_test_expansion,
-                                                      test_expansion_schema)
-            for selection in permute_expansion(expansion):
-                selection_path = selection_pattern % selection
-                if not selection_path in exclusion_dict:
-                    subresource_path = \
-                        spec_json["subresource_path"][selection["subresource"]]
-                    generate_selection(selection,
-                                       spec,
-                                       subresource_path,
-                                       html_template)
-                else:
-                    print 'Excluding selection:', selection_path
-
-
-def main(target):
-    spec_json = load_spec_json();
-    spec_validator.assert_valid_spec_json(spec_json)
-    generate_test_source_files(spec_json, target)
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Test suite generator utility')
-    parser.add_argument('-t', '--target', type = str,
-        choices = ("release", "debug"), default = "release",
-        help = 'Sets the appropriate template for generating tests')
-    # TODO(kristijanburnik): Add option for the spec_json file.
-    args = parser.parse_args()
-    main(args.target)
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/regenerate b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/regenerate
deleted file mode 100755
index e6bd63519b3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/regenerate
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-python $DIR/clean.py && python $DIR/generate.py
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/spec_validator.py b/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/spec_validator.py
deleted file mode 100755
index 8641bbc1f16..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/generic/tools/spec_validator.py
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env python
-
-import json, sys
-from common_paths import *
-
-def assert_non_empty_string(obj, field):
-    assert field in obj, 'Missing field "%s"' % field
-    assert isinstance(obj[field], basestring), \
-        'Field "%s" must be a string' % field
-    assert len(obj[field]) > 0, 'Field "%s" must not be empty' % field
-
-def assert_non_empty_list(obj, field):
-    assert isinstance(obj[field], list), \
-        '%s must be a list' % field
-    assert len(obj[field]) > 0, \
-        '%s list must not be empty' % field
-
-def assert_non_empty_dict(obj, field):
-    assert isinstance(obj[field], dict), \
-        '%s must be a dict' % field
-    assert len(obj[field]) > 0, \
-        '%s dict must not be empty' % field
-
-def assert_contains(obj, field):
-    assert field in obj, 'Must contain field "%s"' % field
-
-def assert_value_from(obj, field, items):
-   assert obj[field] in items, \
-        'Field "%s" must be from: %s' % (field, str(items))
-
-def assert_atom_or_list_items_from(obj, field, items):
-    if isinstance(obj[field], basestring) or isinstance(obj[field], int):
-        assert_value_from(obj, field, items)
-        return
-
-    assert_non_empty_list(obj, field)
-    for allowed_value in obj[field]:
-        assert allowed_value != '*', "Wildcard is not supported for lists!"
-        assert allowed_value in items, \
-            'Field "%s" must be from: %s' % (field, str(items))
-
-def assert_contains_only_fields(obj, expected_fields):
-    for expected_field in expected_fields:
-        assert_contains(obj, expected_field)
-
-    for actual_field in obj:
-        assert actual_field in expected_fields, \
-                'Unexpected field "%s".' % actual_field
-
-def assert_value_unique_in(value, used_values):
-    assert value not in used_values, 'Duplicate value "%s"!' % str(value)
-    used_values[value] = True
-
-
-def validate(spec_json, details):
-    """ Validates the json specification for generating tests. """
-
-    details['object'] = spec_json
-    assert_contains_only_fields(spec_json, ["specification",
-                                            "referrer_policy_schema",
-                                            "test_expansion_schema",
-                                            "subresource_path",
-                                            "excluded_tests"])
-    assert_non_empty_list(spec_json, "specification")
-    assert_non_empty_list(spec_json, "referrer_policy_schema")
-    assert_non_empty_dict(spec_json, "test_expansion_schema")
-    assert_non_empty_list(spec_json, "excluded_tests")
-
-    specification = spec_json['specification']
-    referrer_policy_schema = spec_json['referrer_policy_schema']
-    test_expansion_schema = spec_json['test_expansion_schema']
-    excluded_tests = spec_json['excluded_tests']
-    subresource_path = spec_json['subresource_path']
-
-    valid_test_expansion_fields = ['name'] + test_expansion_schema.keys()
-
-    # Validate each single spec.
-    for spec in specification:
-        details['object'] = spec
-
-        # Validate required fields for a single spec.
-        assert_contains_only_fields(spec, ['name',
-                                           'title',
-                                           'description',
-                                           'referrer_policy',
-                                           'specification_url',
-                                           'test_expansion'])
-        assert_non_empty_string(spec, 'name')
-        assert_non_empty_string(spec, 'title')
-        assert_non_empty_string(spec, 'description')
-        assert_non_empty_string(spec, 'specification_url')
-        assert_value_from(spec, 'referrer_policy', referrer_policy_schema)
-        assert_non_empty_list(spec, 'test_expansion')
-
-        # Validate spec's test expansion.
-        used_spec_names = {}
-
-        for spec_exp in spec['test_expansion']:
-            details['object'] = spec_exp
-            assert_non_empty_string(spec_exp, 'name')
-            # The name is unique in same expansion group.
-            assert_value_unique_in((spec_exp['expansion'], spec_exp['name']),
-                                     used_spec_names)
-            assert_contains_only_fields(spec_exp, valid_test_expansion_fields)
-
-            for artifact in test_expansion_schema:
-                details['test_expansion_field'] = artifact
-                assert_atom_or_list_items_from(
-                    spec_exp, artifact, ['*'] + test_expansion_schema[artifact])
-                del details['test_expansion_field']
-
-    # Validate the test_expansion schema members.
-    details['object'] = test_expansion_schema
-    assert_contains_only_fields(test_expansion_schema, ['expansion',
-                                                        'delivery_method',
-                                                        'redirection',
-                                                        'origin',
-                                                        'source_protocol',
-                                                        'target_protocol',
-                                                        'subresource',
-                                                        'referrer_url'])
-    # Validate excluded tests.
-    details['object'] = excluded_tests
-    for excluded_test_expansion in excluded_tests:
-        assert_contains_only_fields(excluded_test_expansion,
-                                    valid_test_expansion_fields)
-        details['object'] = excluded_test_expansion
-        for artifact in test_expansion_schema:
-            details['test_expansion_field'] = artifact
-            assert_atom_or_list_items_from(
-                excluded_test_expansion,
-                artifact,
-                ['*'] + test_expansion_schema[artifact])
-            del details['test_expansion_field']
-
-    # Validate subresource paths.
-    details['object'] = subresource_path
-    assert_contains_only_fields(subresource_path,
-                                test_expansion_schema['subresource']);
-
-    for subresource in subresource_path:
-        local_rel_path = "." + subresource_path[subresource]
-        full_path = os.path.join(test_root_directory, local_rel_path)
-        assert os.path.isfile(full_path), "%s is not an existing file" % path
-
-    del details['object']
-
-
-def assert_valid_spec_json(spec_json):
-    error_details = {}
-    try:
-        validate(spec_json, error_details)
-    except AssertionError, err:
-        print 'ERROR:', err.message
-        print json.dumps(error_details, indent=4)
-        sys.exit(1)
-
-
-def main():
-    spec_json = load_spec_json();
-    assert_valid_spec_json(spec_json)
-    print "Spec JSON is valid."
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 83bf807c0cd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index cee768b4d3f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 09ecf5a98f3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 27ddbe14cd9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 72059f8b29b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 26322f75e9f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 1fe16bd3fc1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 8f02ff3921a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index e532c627e5b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index a9dc72117a5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 1750d9a09bc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index f2cd6e01066..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 0214509d27b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index fe01beca102..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 249583c8ccf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index f809976cae5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 22661eec35c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 755425577a7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index eaa02ad2983..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 4ae39d55784..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index c9864a5a1ee..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index db8ef405daa..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index cc4437740f7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 3d9d116ef42..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 8e2efeb10cf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 3335a72e71c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index ab03444f9b7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index e81fc8826ef..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index e6bdd252161..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 19a2fe06582..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index a80dd7f2850..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 1221154f79f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index eac9f15e158..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 0a825e7fba1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 3cb001bf5d5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index c0bdf6d9899..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index cfa06807b36..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 324884e8c3d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 07780241974..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 01a946be353..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index ff442044fc4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 890bd45e038..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index adb2c9dd25b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 3bd097e1f8a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 3b50585996e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index ab8d6bbe7dd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 2c2ab524a34..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index f37ebb1e83e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 850f68df4bc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 9605a483c60..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index ce77bfdac5d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index d2cbca0c187..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 5ea85574719..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 6feb8e25d7c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 32672ff5810..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 68eafc86595..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 8f45b4cc4e5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index ac808dd6df3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index ebdd25b0abb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index a8ba4b2f236..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 36a5dcdfa4d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index f8558f488a6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index ffbda4f21db..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index e2ec6987400..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 85920063000..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index d7110749891..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index e87c84ec0da..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 7c5ef9383a6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index fd55d3a6a07..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 550eee944f2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index a89179ba454..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 1ed25cc30c8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
deleted file mode 100644
index f2152da955f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer-when-downgrade
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index a2b065d6b26..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 72af59fd829..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index d593b58fe40..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 33267880b67..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 5eb3618345d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 147e3b91a93..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index cde014b2863..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 8ea3b75d95b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index f5813e5c39f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index c837d1c0f10..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index c999da57203..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 246f9e80b23..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 2763a8f87dc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 507a43f7e39..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 9ca934c5435..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 5b5524efe50..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 7fcaf289293..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index faba80d8519..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index e44c3596a0d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 9f8dc97322a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 06bd9ef1c9d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index bf25ce542b2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 3a178db8d0b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 9761abdcc49..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index ee3b88828e7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 11cdafe5682..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 86f0dea9ef3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 8d8f78563ab..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 7b15091b001..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index e93c7ad539b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 593552134e3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 6b246ffb5d7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 1626df0349e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 8ae96949347..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 30b76fc541a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 98f0a3dd3ee..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 279994960af..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 9c389b696a6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index c15cb2e7ccd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 9807e217061..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index ca120d93477..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 0a2b8becbdc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 6ab8a293637..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 071b763a016..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 576afe6face..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 8fc3c1025d7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 27aa02f7092..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 42c11cd548d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index de0af059873..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 99c24a45106..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index afa999806ed..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 18ed8c2a184..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 45da44217d3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index c46ebbf18c7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 94172e0932d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 0caa9038f71..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 1a5d0d016a4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index a52353d51e9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 2e03e034f77..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 8352b8e96a4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 44b84e129cb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 93281743059..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index efb6b0930df..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index df2c221cf75..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index fbde8afaf27..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 5a7cadef302..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 49b5996c0f9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index d3e8e2bf66a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 5bc9df06330..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 24a2a24752c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index e35010b0dcb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 8e446c5de5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
-    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
-    <meta name="referrer" content="no-referrer-when-downgrade">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer-when-downgrade",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 77e5e8d48a3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 3ad89e9922b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 83da898bf3c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index d45aaba6977..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 287685b5ab4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 5abf46c7980..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index fc80b64e268..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 24745ae3ef6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 36a1a51101c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8bf9811b9a4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index be0a0f5cc56..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 8fe5a517d5f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 6b526036e20..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index e0b557655bc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index a64c1843df1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 466e0732705..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index d947f323df3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b2aab04b80e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 32759c04828..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index f1f700ca9b9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index fbd53059054..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 3d9ec06dffd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 85d499e318c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 6f6db1a8b27..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index a9cc6a5af8c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 1e69ce64168..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 9c01e379f1d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index b6150dde844..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index a2a1db135fc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 13176108c8e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 89ebca36ab3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 8fc8f828d9c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 60ee2b5a3a6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 76209dbb3b4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 85687e0a3eb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 3000a27662f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 9707534637e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0b94a5651b2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index fd3e18548a3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 51940c818f4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index d79f35c4db1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 6d8aac0b098..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 732b81fa39d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 68f660949ff..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 33cc2cd2074..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 3d173eaaefc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 2561ba4d319..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index cc793db90bd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 69c952cd784..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index d757d0593fd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 4d7b5a3d3f6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 09981bbb6aa..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 711d89c27a5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 920a6aa6db1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 30e24be56b9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 117497f3ff9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 0e6d4a9e118..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index e95d47d00f9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index ddd4a15dd18..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 210024dcd96..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index c184cd6a656..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 4fac6209fe6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b777f5d7346..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 1bf59a19f22..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index dd20ac03da1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 04606d455f7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 5f4a0b837f8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 7f867505892..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 9583a7b4d3d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 677ba17cba9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0df663772b3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 49f9b375b62..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9b531426e5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: no-referrer
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 45da314204e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index b259b7d8064..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 4deb67194d7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index d0b1c19a88e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 784a6f9a007..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 72593464206..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 3ad3a9184ff..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index dcdbc5cbbda..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 16e80c285b2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 6d00e4eeb09..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 791247457d9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index f2ed755b6d6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 35f7ec2afdd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 8ffb65ba5b7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d2b709aabd0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 7150dff86ee..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 2aa1fa8d127..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 27aebad544c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 6b2540d5f5f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 819b5922ad4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 1429500d3c9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 6ef9c003f08..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index ceefd0655ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index e44a7706825..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 4b1aa50e368..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index faf311f3752..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 321f0020883..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 2f0a2304609..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 28a4e866df0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index be955ec5ae7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 2635005c5f0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index e9c75d338c1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 222345cdbaf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8ed1924243e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index fdee7a7516f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index cbf87e59aa8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 82ade79f959..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index d30a2c60448..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d8c1c5c12c4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 65a5904307c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index d81c61c30a8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index ee95872bd41..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index f02f304e9a5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index fa8befb90b1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 211cd9e521e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 13ffc1e1a26..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 90af09cd5aa..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 1b38c274630..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 753c68b83e8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 6ddb9e51eab..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index ced4d31a52d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index b381862d492..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 29681de581f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b366a33270b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index fff8111ef0e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index b3ed7b08674..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 72c9500f066..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 92fd3721d25..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index ebb5f44de1b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 611419f7613..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 29aab961a07..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index a2038278654..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index cc49ae2b667..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 42a9b7b023c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 078ee850132..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 88ce04e35ab..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 464af4b5377..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 871627d216f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 804b73315e0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 6757947a83a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 2a61e58cc71..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d3e5c18bc3e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <meta name="referrer" content="no-referrer">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 3bfe8fd9c86..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index de5baf213d2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 84829846daa..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 19cdd166366..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 9c7d1020684..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 9e2bd4f9efb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 0cff6bfc9fa..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 826bb87307f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 9684bbc28c5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index b0852508311..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 6fdf0378e5c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index dcd654c7e18..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index d270cb39f8b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index dc28d81061c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 0c32784d7a5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 6a846e94f89..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index ee8605cf202..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index f2352085ed0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index f80fe8f7dae..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index f556af21e8d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d7f59c41bf2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the rel-noreferrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index d348770a9e6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 2155ba40e86..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 6e6860e3a04..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
-    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the rel-noreferrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "no-referrer",
-          "delivery_method": "rel-noreferrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 815c38b5dd2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index ded83d5d7da..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index cbcccaba567..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 5c94c1450fb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 1d040a2955b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index e6e0d838fd1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 9efdd01d344..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index f2ef19ffd4b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 6a12943b1fd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 67d3c1a1624..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index a452885cc24..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 0b6928140cf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 5e9526c5ecd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 32a78fbb525..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index d84a4f6f490..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 35ec5a15fbe..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 374b1cb158c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index e1fb23efad1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index e130f72c2bf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 4ac830a03c4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 04fd8577b72..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 6f3e6f257a7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index a0e7459c01e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index f9716974554..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index b1b62cfb5e8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 93c006f59f9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index c95f60cb59c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index c29f95f22df..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index 13b3de74e09..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 18c5714e3a4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 18c5714e3a4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index c29f95f22df..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index 13b3de74e09..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 18c5714e3a4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 83ecb90b896..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index 26e249ba7ec..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 640338c0e17..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 640338c0e17..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 83ecb90b896..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index 26e249ba7ec..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 640338c0e17..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 7d0c6341add..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index be4a9a26f26..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 87330980857..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 87330980857..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 7d0c6341add..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index be4a9a26f26..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 87330980857..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 343ce2731d3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 004fb320048..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index ef2f5ff0d36..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index c9e4e2bdb48..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 530b5af744e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index fb20d79f52b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 326b9994a50..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index cbd4159afc3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 3bedb2ee41e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 3fac660ebf0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index d8d9e5a1aed..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 6478ba73fb9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 46daea793ea..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 07acdbe7689..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 2526f2cfacd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index feb4bee59d2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 4035b957050..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index a15529459cd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 9900ed1274e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index d874a5bea34..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 8346d8ebee7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index c532e2d40fb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index f63abd6a25d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index b58096acd88..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index e6ad72f5dec..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 784d927fbae..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 2d078641a2b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 9699d68e608..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index 643d25eb258..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index a5a665855bf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index a5a665855bf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 9699d68e608..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index 643d25eb258..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index a5a665855bf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 5a0d1c44cfe..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index 9174597bb1b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 03ed4974e1d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 03ed4974e1d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 5a0d1c44cfe..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index 9174597bb1b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 03ed4974e1d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 74d050c01e2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index c683f39386a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 9a83e45fc9b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 9a83e45fc9b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 74d050c01e2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index c683f39386a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 9a83e45fc9b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 9ce1de38843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin-when-cross-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 8c1dd13f7d3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index e0bdbf2e738..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 9ec4e2eee25..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index e9d372c691d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 6c2006cc435..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 06b463b95bf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 195ae61fb6e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index d375decad32..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index c43503d853a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index ca798ce4de9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index cc4e0dfcc61..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index d46ea96f809..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 209789908e4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 3d1fb44d2dd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index d4765f110bf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 370fc2a4c30..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index b8f553a3b6b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 4f630bb76e8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index fd290122d4a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index b1d294625df..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 0abec66abc5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index da74e85bf42..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 649bfc88c4e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 01cc6d616f2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 3ed141c6b26..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 15e47a4d8c0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index e0247c849e6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index dad14a2029f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index 21ba0112760..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 4551f14155d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 4551f14155d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index dad14a2029f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index 21ba0112760..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 4551f14155d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index adfc443855b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index b93ac7af744..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 939a4da80c2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 939a4da80c2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index adfc443855b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index b93ac7af744..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 939a4da80c2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index e69f8b21f36..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index 7b6f1711589..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index ef84dbb2472..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index ef84dbb2472..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index e69f8b21f36..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index 7b6f1711589..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index ef84dbb2472..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 7a0f11781f6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index ea68bc8d360..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 4fb42c82c17..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 6029c0f43d8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 175881f7ee9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 6f44d2fce1f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 029f24397e0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index acec6ab695e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 6ad06932882..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 73e4981835c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 70827af78c9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 00460d2b158..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 139d39c5a3b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 680690fdf2b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 81356744fc0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 8d9ca03da94..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 2d2e433b478..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index aa5660434e4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index f77f66508af..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index eb5163656c1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 079b162006c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index d15535951d8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index f000678eaed..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 655c90d9b8e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 9503e39076a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 61af6eef70e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index d802bf4d12f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 0016765809e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index eebede0c192..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 1a49a2edfa8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 1a49a2edfa8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index 0016765809e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index eebede0c192..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 1a49a2edfa8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index d85104a812c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index 21ea51aa950..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 551d6a89ba7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 551d6a89ba7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index d85104a812c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index 21ea51aa950..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index 551d6a89ba7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
deleted file mode 100644
index d5bc828da42..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
deleted file mode 100644
index f6adc1f3854..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
deleted file mode 100644
index b42a5b1b3fd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index b42a5b1b3fd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
deleted file mode 100644
index d5bc828da42..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
deleted file mode 100644
index f6adc1f3854..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
deleted file mode 100644
index b42a5b1b3fd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="origin-when-cross-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin-when-cross-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index f71a89d5a06..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index ab50e53d7da..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 6285bb9dd0e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 17f7d65d9e8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 6a3dfd52dab..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 48402b0d783..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8eeeb208a9b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 39867d69625..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 24f8a4711e8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 15ba583677c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 4278df3afcc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 866bf28e395..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 4f0e28ccf1b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 8909d7100e2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index aa063b1769a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 62b2bf6a363..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 6278b2c790a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 8bbe3d49fb9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 47bf32f7796..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index ba7f97463b8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 89407a8fc40..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index adb4ce3bdaa..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 3dbea6f9f89..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index ade9eac85c4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8fbec317904..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 91012ed10e9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index e435078f97f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index e53ed40a362..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index cec1e3241e7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 2b501bc0e25..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8378a40426d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index d7e2b162ff0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b43eddfd41c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 1fcc4672fc4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index aa6afba6a80..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index a4aebd5b6c0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index b3f3fa89f00..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index ede8337afdc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index fee053bbaa0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index d51a67fecb1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 93bb6427144..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b96ed59303b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 7978befcbb4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 83107c22a97..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 15415806924..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index bfa539628c2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0bf5e85e7f1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d21adb12187..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index ba07e73e1ae..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index b1d4a3a6c2a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 17a3af34f5d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8440f01adeb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index d8eed570f42..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 313554bb642..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 5215d602a82..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 7ec48982bf7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index caefa979a8f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 1d97caffff5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 5e52c0071af..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index aebc77f4060..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 431959cedaf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index c9d7de85f5b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 8a8c495f79a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 88f33debae8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 587dec2eed4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 6e4975ddd1c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index d9521c9f3bd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 96507206472..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 08aa2fc9e04..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 19771b222b9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 82db2bf5149..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index ad2ac0a5cc1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 306a53536ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 0331c47034a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index acf164cb0c8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index e32860d57a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8c786343243..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index db83beb26b0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 4fbcd00200b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 25321730bd1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index f0a0559e9da..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 7b9dce7cb56..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index d601be6ac9e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0d4e85774b4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index af0ebfff865..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index be79f6d384e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 2802fb27b50..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index a5cda82030e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 85f8ad04e6c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index b4faa1d0164..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 1fe71db41ff..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 20031b40fc8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index fd87b73e53d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 37477fa39d4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index bd97c5a135d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 7c49eef0f93..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 47e75f0f876..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index e949108885b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 665d255ffac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index ccccda10faa..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 5a225b0e497..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 3c3451162c0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 9667c5ac9f0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 7e32c08736d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index b05801a3a7c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b05a63574a0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index b06ffffe0e5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index ac2c965196c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index e8ed2b5589e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 20d18f01222..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 49ad6dcb103..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 1329e58f725..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 422ade7709e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 9d5979cef46..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b9f39e7b6b7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 7e015b859d2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index e8313d85b73..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 116b46faaa4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index ca78ee55828..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index eda8846df09..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 02ad3f38129..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index d56184246f4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 27864e68710..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 3c7b8573e7e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 073526e6609..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 441778a4ca0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 573661e0e09..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 0076ed61b34..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index ac19d40181d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b3527924da8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 1de21553f52..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 823bea3dcc7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index f3938f34659..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 323fef96518..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 44e3e9168c4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index ae49ce7fe4b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 569b935c6e6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index d519377294d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 1ff73198087..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 669437c23bd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 8ba60eeba23..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 01bb9959d6e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index e52899ab422..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index c62cdd65804..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 594b8ef53e7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
-    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
-    <meta name="referrer" content="origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
-    <meta name="assert" content="The referrer URL is origin when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "origin"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 64c3e513117..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 07b3f14fc1c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index f5330d6d5d5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 312276b0465..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 3fe953a3bc5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index f7c408785ac..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 37fd0c7e596..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 20a569d073c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 33143fc4964..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 630f675cf67..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 3aff8cafb67..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 9bae615f2e8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index fbccbc7a3b5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index a35c040df05..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 0955920c15c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index b940da77619..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index ef42cade596..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index e7e817356d6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index f15ae6275cf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 6dc602b5fa7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 3713c113ed3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 9ce9b038cbc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 5803a58ff63..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index d6c1ed5300c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 6c5d363a78a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index db4a1fd200f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index ecc61c83f9e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index f55b88eb3bc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index d7f136b8ef9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 8503d94458d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index a1a7ea824b9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 19ba88b3897..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 9144d3bdd9b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 1656f802bdc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 3f9e73b0f47..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 19902610e43..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 3ae0fc113f7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index c6a25b099cd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 012454dff81..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 802b76c990d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 8b68bc2e7a0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 6808e0eeb25..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 334f788ff02..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index f3935a8d01a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 9a19f366a4c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 54a58f0657b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 973d442b22d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index db9e8f45bc3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 24c16d859ff..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 54991a5baf2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 8f1e8a63794..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index eae3e204605..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 990ef336278..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 9fb89ff1955..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 1a63a6bd5b0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 945ba27e398..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 3bb1fdabae3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 47cf5944b62..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 794b5716945..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index d6858676dd2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
deleted file mode 100644
index 309da8091a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: same-origin
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index a83240bcb3a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 81806a28228..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index fb08052790f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 22c0872e4c9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 933c5958219..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 01f217fbda4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 3f816358332..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index dc9c2bd864e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index bdab5ff29b5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 861b4ba1963..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 4427f355087..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index fe2d26bc276..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 834b39ffa09..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 60931a807ae..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 31343636d22..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index be07e70d377..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 5e958d018ce..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 6baef59ef21..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 8458782abc4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 0d38bcfe37f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 5212d8281b0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 319fe589c18..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index 4356afdb21b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 29605ba6f4b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 54e0c02da61..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index ade7a69448c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 9fa93d4c81f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index b781baac14f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index e5bd3e6c90a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 49ca274bddd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 16c78406d19..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 8b732b83676..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 44d49058666..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index f928a811ccf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 43335972ee2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index a5260dd2720..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index ff26a215f4d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 7d908013e69..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index e3aace756e0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 46a128d1ccd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index e997bbb313b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 9ec94e174b8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 676877a3267..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 702f2f80c29..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index efc4dca2897..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
deleted file mode 100644
index 17c00cad00e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
deleted file mode 100644
index 96b614ed5c7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
deleted file mode 100644
index 9d8d15126ad..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 78bb08e9bf7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index acc7b48132e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 52d73b3986d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 8ba20f9d186..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index bbc7105f2f6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 1d7be646f45..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
deleted file mode 100644
index 32ae1d8058d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
deleted file mode 100644
index df69eb5038d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 383cae4607b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-http/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 3ce89779567..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 8bcd726fd72..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
deleted file mode 100644
index 7216f2eb9c5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
-    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
-    <meta name="referrer" content="same-origin">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
-    <meta name="assert" content="The referrer URL is omitted when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "same-origin",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "omitted"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json b/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json
deleted file mode 100644
index f7adf5560cc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec.src.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-  "specification": [
-    {
-      "name": "unset-referrer-policy",
-      "title": "Referrer Policy is not explicitly defined",
-      "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.",
-      "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies",
-      "referrer_policy": null,
-      "test_expansion": [
-        {
-          "name": "insecure-protocol",
-          "expansion": "default",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        },
-        {
-          "name": "upgrade-protocol",
-          "expansion": "default",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        },
-        {
-          "name": "downgrade-protocol",
-          "expansion": "default",
-          "source_protocol": "https",
-          "target_protocol": "http",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "omitted"
-        },
-        {
-          "name": "secure-protocol",
-          "expansion": "default",
-          "source_protocol": "https",
-          "target_protocol": "https",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        }
-      ]
-    },
-    {
-      "name": "no-referrer",
-      "title": "Referrer Policy is set to 'no-referrer'",
-      "description": "Check that sub-resource never gets the referrer URL.",
-      "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer",
-      "referrer_policy": "no-referrer",
-      "test_expansion": [
-        {
-          "name": "generic",
-          "expansion": "default",
-          "source_protocol": "*",
-          "target_protocol": "*",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer", "rel-noreferrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "omitted"
-        }
-      ]
-    },
-    {
-      "name": "no-referrer-when-downgrade",
-      "title": "Referrer Policy is set to 'no-referrer-when-downgrade'",
-      "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.",
-      "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade",
-      "referrer_policy": "no-referrer-when-downgrade",
-      "test_expansion": [
-        {
-          "name": "insecure-protocol",
-          "expansion": "default",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        },
-        {
-          "name": "upgrade-protocol",
-          "expansion": "default",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        },
-        {
-          "name": "downgrade-protocol",
-          "expansion": "default",
-          "source_protocol": "https",
-          "target_protocol": "http",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "omitted"
-        },
-        {
-          "name": "secure-protocol",
-          "expansion": "default",
-          "source_protocol": "https",
-          "target_protocol": "https",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        }
-      ]
-    },
-    {
-      "name": "origin",
-      "title": "Referrer Policy is set to 'origin'",
-      "description": "Check that all subresources in all casses get only the origin portion of the referrer URL.",
-      "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin",
-      "referrer_policy": "origin",
-      "test_expansion": [
-        {
-          "name": "generic",
-          "expansion": "default",
-          "source_protocol": "*",
-          "target_protocol": "*",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "origin"
-        }
-      ]
-    },
-    {
-      "name": "same-origin",
-      "title": "Referrer Policy is set to 'same-origin'",
-      "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.",
-      "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin",
-      "referrer_policy": "same-origin",
-      "test_expansion": [
-        {
-          "name": "same-origin-insecure",
-          "expansion": "default",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "same-origin",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        },
-        {
-          "name": "same-origin-secure-default",
-          "expansion": "default",
-          "source_protocol": "https",
-          "target_protocol": "https",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "same-origin",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        },
-        {
-          "name": "same-origin-insecure",
-          "expansion": "override",
-          "source_protocol": "*",
-          "target_protocol": "*",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "subresource": "*",
-          "referrer_url": "omitted"
-        },
-        {
-          "name": "cross-origin",
-          "expansion": "default",
-          "source_protocol": "*",
-          "target_protocol": "*",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "cross-origin",
-          "subresource": "*",
-          "referrer_url": "omitted"
-        }
-      ]
-    },
-    {
-      "name": "origin-when-cross-origin",
-      "title": "Referrer Policy is set to 'origin-when-cross-origin'",
-      "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.",
-      "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin",
-      "referrer_policy": "origin-when-cross-origin",
-      "test_expansion": [
-        {
-          "name": "same-origin-insecure",
-          "expansion": "default",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "same-origin",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        },
-        {
-          "name": "same-origin-secure-default",
-          "expansion": "default",
-          "source_protocol": "https",
-          "target_protocol": "https",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "same-origin",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        },
-        {
-          "name": "same-origin-upgrade",
-          "expansion": "default",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "same-origin",
-          "subresource": "*",
-          "referrer_url": "origin"
-        },
-        {
-          "name": "same-origin-downgrade",
-          "expansion": "default",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "same-origin",
-          "subresource": "*",
-          "referrer_url": "origin"
-        },
-        {
-          "name": "same-origin-insecure",
-          "expansion": "override",
-          "source_protocol": "*",
-          "target_protocol": "*",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "subresource": "*",
-          "referrer_url": "origin"
-        },
-        {
-          "name": "cross-origin",
-          "expansion": "default",
-          "source_protocol": "*",
-          "target_protocol": "*",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "cross-origin",
-          "subresource": "*",
-          "referrer_url": "origin"
-        }
-      ]
-    },
-    {
-      "name": "unsafe-url",
-      "title": "Referrer Policy is set to 'unsafe-url'",
-      "description": "Check that all sub-resources get the stripped referrer URL.",
-      "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url",
-      "referrer_policy": "unsafe-url",
-      "test_expansion": [
-        {
-          "name": "generic",
-          "expansion": "default",
-          "source_protocol": "*",
-          "target_protocol": "*",
-          "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"],
-          "redirection": "*",
-          "origin": "*",
-          "subresource": "*",
-          "referrer_url": "stripped-referrer"
-        }
-      ]
-    }
-  ],
-
-  "excluded_tests":[
-    {
-      "name": "mixed-content-insecure-subresources",
-      "expansion": "*",
-      "source_protocol": "https",
-      "target_protocol": "http",
-      "delivery_method": "*",
-      "redirection": "*",
-      "origin": "*",
-      "subresource": "*",
-      "referrer_url": "*"
-    },
-    {
-      "name": "elements-not-supporting-rel-noreferrer",
-      "expansion": "*",
-      "source_protocol": "*",
-      "target_protocol": "*",
-      "delivery_method": ["rel-noreferrer"],
-      "redirection": "*",
-      "origin": "*",
-      "subresource": [
-        "iframe-tag"
-      ],
-      "referrer_url": "*"
-    },
-    {
-      "name": "source-https-unsupported-by-web-platform-tests-runners",
-      "expansion": "*",
-      "source_protocol": "https",
-      "target_protocol": "*",
-      "delivery_method": "*",
-      "redirection": "*",
-      "origin": "*",
-      "subresource": "*",
-      "referrer_url": "*"
-    }
-  ],
-
-  "referrer_policy_schema": [
-    null,
-    "no-referrer",
-    "no-referrer-when-downgrade",
-    "same-origin",
-    "origin",
-    "origin-when-cross-origin",
-    "unsafe-url"
-  ],
-
-  "test_expansion_schema": {
-    "expansion": [
-      "default",
-      "override"
-    ],
-
-    "delivery_method": [
-      "http-rp",
-      "meta-referrer",
-      "meta-csp",
-      "attr-referrer",
-      "rel-noreferrer"
-    ],
-
-    "origin": [
-      "same-origin",
-      "cross-origin"
-    ],
-
-    "source_protocol": [
-      "http",
-      "https"
-    ],
-
-    "target_protocol": [
-      "http",
-      "https"
-    ],
-
-    "redirection": [
-      "no-redirect",
-      "keep-origin-redirect",
-      "swap-origin-redirect"
-    ],
-
-    "subresource": [
-      "iframe-tag",
-      "a-tag",
-      "link-tag"
-    ],
-
-    "referrer_url": [
-      "omitted",
-      "origin",
-      "stripped-referrer"
-    ]
-  },
-
-  "subresource_path": {
-    "iframe-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-    "a-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-    "link-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py"
-  }
-}
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec_json.js b/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec_json.js
deleted file mode 100644
index 7876ce88d71..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/spec_json.js
+++ /dev/null
@@ -1 +0,0 @@
-var SPEC_JSON = {"subresource_path": {"a-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py", "iframe-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py", "link-tag": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py"}, "test_expansion_schema": {"origin": ["same-origin", "cross-origin"], "subresource": ["iframe-tag", "a-tag", "link-tag"], "target_protocol": ["http", "https"], "expansion": ["default", "override"], "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer", "rel-noreferrer"], "redirection": ["no-redirect", "keep-origin-redirect", "swap-origin-redirect"], "referrer_url": ["omitted", "origin", "stripped-referrer"], "source_protocol": ["http", "https"]}, "specification": [{"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "referrer_policy": null, "title": "Referrer Policy is not explicitly defined", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "unset-referrer-policy", "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "referrer_policy": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer", "rel-noreferrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "no-referrer", "description": "Check that sub-resource never gets the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "referrer_policy": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "no-referrer-when-downgrade", "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "referrer_policy": "origin", "title": "Referrer Policy is set to 'origin'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin", "description": "Check that all subresources in all casses get only the origin portion of the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "referrer_policy": "same-origin", "title": "Referrer Policy is set to 'same-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "same-origin", "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "referrer_policy": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-upgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-downgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin-when-cross-origin", "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "referrer_policy": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "meta-csp", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "*", "subresource": "*"}], "name": "unsafe-url", "description": "Check that all sub-resources get the stripped referrer URL."}], "referrer_policy_schema": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "unsafe-url"], "excluded_tests": [{"origin": "*", "name": "mixed-content-insecure-subresources", "target_protocol": "http", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "elements-not-supporting-rel-noreferrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["rel-noreferrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["iframe-tag"]}, {"origin": "*", "name": "source-https-unsupported-by-web-platform-tests-runners", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}]};
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 045bcac93b1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index b072b5a4c02..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index f2ad2ddedfd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 9179811d1c2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index e2b1236b672..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d0146639f1d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 070b061df98..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 07489ac9e00..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index f05d2d616e3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index a05dee44af0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 9cce7e804ba..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b30b4c6d30f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 1f98c42c063..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 9d35bc3e922..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 74d94a62ba1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 2d11018daf4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index b2c328fee1d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index a42dac5ea8c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index b7ac0533265..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index a90bbbda2dc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index bd0892ddb93..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index a061edfe41a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index aeefc83108b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 4862ff56985..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 5954ffb452d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index bc74ed88f3f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 981b7cb433a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 581ce7e2114..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index eeb41bebe4b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 5835df3255a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index e3846614b50..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 3dd9dba74c6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 5a939a0646a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 42a08183076..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 294c34988a0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 21cd12c78a7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index a3e03d25100..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 7cb2cf9f282..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 877481e5278..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 812aaf97b3b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 7079a3ecf12..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 4d0abae23bc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 263ed4ad8a3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0d711ba831e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index a776b110beb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 4d3ec5a2d28..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index a4f6c9d4ad9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 3fbe4baf4aa..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8ca7b4f8019..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 03536b7d829..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 312c3306555..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 38ad3e7c716..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 26a0b4ca86b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b2cd36278b0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index e07172d0859..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index e698f8d2370..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d63b7a8d734..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 3296688b653..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0798bd32eb4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index be0c6556d80..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 04b712594d2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index f77e949d088..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 227f9f617a9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 7ce1dbb2723..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index b221db2ce0f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 8732ad05733..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index dd2862159a8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 2b65afe48cb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 10af95e08be..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 9d1efa4b78c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 20262f9f3b6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 1746e7e2677..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <!-- No meta: Referrer policy delivered via HTTP headers. --><meta name="http-referrer-policy" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
deleted file mode 100644
index c67e5215843..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Referrer-Policy: unsafe-url
-Access-Control-Allow-Origin: *
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 5716de7f0e8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 474328d554e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 9119c33215f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 68e5be85895..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index a801987ee42..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 0ebf097f528..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index a80c064e057..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 44cdc96b396..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 0f6c7b8ed3c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 54168c30911..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 5d5d9cd8b7d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index c0c70e205b0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 5bfd21dc670..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 9518a8345df..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d417c51a7f7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 7ae3f843b61..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 6e8c66b0a99..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 77d8cd3ba31..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 9319c0711cc..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 3ee2577c1a7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 4ebbe2ddd68..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index a3dd3c178df..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 710a6ebd92a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 7c0e976cb3c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 827e86e657b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 1d3ff489f5c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 708b60ad81a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 305e52dd1d4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0fb463d9cb9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 3822d95abf4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 1bef209b9f5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index ec5346324fb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 871a644a25f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index a6e4df5a70c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 774f8c38071..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 9dc8ef78ac8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta http-equiv="Content-Security-Policy" content="referrer unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index de16edf2389..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index e01d1c5974f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index a72d8e10263..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 2e7b085cb12..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0d2c537c82a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 50aa24f14f6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 22e054e853a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 77b72dc6bea..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index de394bd907a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 4f9d7a427e5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 9eb02e21b6a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 0788cb7ef60..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 433d4a88f55..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 34422dff172..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 674d067c799..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 9c0e880d8e2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 0eaed368b9e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 14064694943..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 9441fb3e141..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index 7ab0e0b903f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 5b583c37407..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 8a60d8403eb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index 36375ec69a1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index d86a2c6082a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 57bd3fea383..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 7bf66e45fe9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 3f3b65db58a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 2d8ba97e933..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
deleted file mode 100644
index d2efd78994c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 0d4515e1073..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index 0114faea539..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
deleted file mode 100644
index c0513b16286..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index b6ae226d380..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
deleted file mode 100644
index b29c17497ec..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
deleted file mode 100644
index 351097a301c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
deleted file mode 100644
index 1229662156c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
-    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
-    <meta name="referrer" content="unsafe-url">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": "unsafe-url",
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 93b9d5aecf5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index a91cf4ae8c4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 8a082d8ef39..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index be90b8116e3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 2b2a2ba1773..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 3d47e720d2b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 4ae0a5a4c03..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 92c40cea6b5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index e4249e5fbd4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index d6c5583476b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 3dd098ae5de..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 185a330236e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index f0801c98e27..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index d61b377c850..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 1838bf18b14..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 5ac824c07c1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 5b6ff3a0362..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 0c2120e8bad..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index afe427f1c7e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index b8fd5b6b9eb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index f83fc086196..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index feb927b1ed4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 2493c65f1b9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 815df682caf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 6c298ed9570..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 9a0fd2c0706..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 78949fe1046..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 9c0e166e768..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 84231dca9fe..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index b82a55099d0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index e1ffc5ae0c3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 6934e2d6bf4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 27e8bd2f3f4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index b2c4bbfa3b7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index f713368e05a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index b35b54ca2bd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the attr-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "attr-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 626d8f9d3c0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 3886b0f939c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 71c98dcf126..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 5a5f46e6df8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index c833910430a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 2c4b2eef4cb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 8f93c3fc749..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index e5fd04a01d7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 981cf112643..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 1c0105ef322..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 011e36d58a7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 5dad3ba6608..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index e3f74180920..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 12a40677144..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index eab63db369c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 21098f78449..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 8e68ef3d190..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index b8cf52ab72f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 26014f6eb13..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 60ea1c31c61..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index d99a44ab922..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 732d552c234..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 9f8c6c1e641..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 4ef2c6ff1f8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 2eecdbd6661..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index eae2e6c27ed..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index ec962e1c066..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index eebae700192..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 86b4cfc8703..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 999ce8c8eae..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index bf2ce337bd7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index cb1e783ae11..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index aee070f673e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 171754f6fe1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index bb0f7763a46..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index f88d1c218ed..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the http-rp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "http-rp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 1a31f648665..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 7a383030848..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index dc59e659dc0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 1e18aa1d427..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 04c6cc0ed50..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 41a5a748d02..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 29f92f27896..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index c0b6c896f33..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index a8982c2d322..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index cba8b0c1383..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index d22406c8c67..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 8a51e5df6bd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 80d9e8bc3df..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 115db8635bf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 7d796ecbe70..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index ecd8b40bee7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 0b07e9e4be8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 2863f4fea64..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 2950ac7c8e8..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 6a3b56e2dd1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 9e7cae1f028..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 947e96a7524..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index d34ef9a51e9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 325818ee6ad..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index d360b620109..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 4f7bd15bdda..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index d5c67e9795a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 8fefca756d4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 85deff7538a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 6b7341603eb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index c212c459b81..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index e22ec99c4fb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index ec780a6fd6c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index ca599a8cb28..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index c403586ce59..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 96ed707ad5b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-csp
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-csp",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 7c088191c07..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index d3bf4236f99..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 03aca9aa172..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 1d456ab812c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 02d188ed124..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 0f5f1125620..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index e3287be7b4a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index e33fa22a741..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 36600f3a7d5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 52579447a99..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index e38ef39c25c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 6e94b34aa03..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index bd38cf56ace..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index e61f6b25f33..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index a76f757cd47..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 1473b1cc796..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 5023daec823..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 37e93fe2115..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is cross-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "cross-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 748621eaf2c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 5a329637a5d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 71694c1737f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index ac4c71e6d3d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 99eb5b4e0db..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index ad0eddad5b1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 24ace89db1b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
deleted file mode 100644
index 54a470dfe01..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index cb97cdd3aa3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/link-tag/insecure-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an http
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "http",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index f04c297234f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index 3dee6be3ec6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index 7b39649e102..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via a-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "a-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/a-tag.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index 1f7023b18ff..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index e74ef310480..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index d91ba8129b7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via iframe-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "iframe-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/document.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
deleted file mode 100644
index c369359eec6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with keep-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "keep-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
deleted file mode 100644
index c2168679e58..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with no-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "no-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
deleted file mode 100644
index d4b78d316c0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
-    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
-    <meta name="assert" content="The referrer URL is stripped-referrer when a
-                                 document served over http requires an https
-                                 sub-resource via link-tag using the meta-referrer
-                                 delivery method with swap-origin-redirect and when
-                                 the target request is same-origin.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <!-- TODO(kristijanburnik): Minify and merge both: -->
-    <script src="/_mozilla/mozilla/referrer-policy/generic/common.js"></script>
-    <script src="/_mozilla/mozilla/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      ReferrerPolicyTestCase(
-        {
-          "referrer_policy": null,
-          "delivery_method": "meta-referrer",
-          "redirection": "swap-origin-redirect",
-          "origin": "same-origin",
-          "source_protocol": "http",
-          "target_protocol": "https",
-          "subresource": "link-tag",
-          "subresource_path": "/_mozilla/mozilla/referrer-policy/generic/subresource/link.py",
-          "referrer_url": "stripped-referrer"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>