From e9fdc4c72a1f93223dc22ae83d9c63271989505d Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 5 Apr 2017 16:42:37 -0400
Subject: [PATCH] Replace hosts when making TCP connections, not when verifying
 SSL certs.

---
 components/net/connector.rs                   | 43 ++++++++++++++++++-
 components/net/http_loader.rs                 |  3 +-
 tests/wpt/metadata/cors/basic.htm.ini         |  8 ----
 .../basic/mode-same-origin-worker.html.ini    |  3 ++
 .../fetch/api/basic/mode-same-origin.html.ini |  3 ++
 .../fetch/api/cors/cors-basic-worker.html.ini |  6 +++
 .../fetch/api/cors/cors-basic.html.ini        |  6 +++
 .../cors/cors-no-preflight-worker.html.ini    |  8 ----
 .../fetch/api/cors/cors-no-preflight.html.ini |  8 ----
 .../api/cors/cors-origin-worker.html.ini      | 12 +++---
 .../fetch/api/cors/cors-origin.html.ini       | 12 +++---
 .../messageevent-constructor.https.html.ini   | 22 +++++++++-
 ...ection-events.serviceworker.https.html.ini |  4 +-
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../a-tag/generic.no-redirect.http.html.ini   |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../a-tag/generic.no-redirect.http.html.ini   |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../a-tag/generic.no-redirect.http.html.ini   |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../a-tag/generic.no-redirect.http.html.ini   |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...wngrade.keep-origin-redirect.http.html.ini |  3 +-
 ...origin-downgrade.no-redirect.http.html.ini |  3 +-
 ...wngrade.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...upgrade.keep-origin-redirect.http.html.ini |  3 +-
 ...e-origin-upgrade.no-redirect.http.html.ini |  3 +-
 ...upgrade.swap-origin-redirect.http.html.ini |  3 +-
 ...wngrade.keep-origin-redirect.http.html.ini |  3 +-
 ...origin-downgrade.no-redirect.http.html.ini |  3 +-
 ...wngrade.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...upgrade.keep-origin-redirect.http.html.ini |  3 +-
 ...e-origin-upgrade.no-redirect.http.html.ini |  3 +-
 ...upgrade.swap-origin-redirect.http.html.ini |  3 +-
 ...wngrade.keep-origin-redirect.http.html.ini |  3 +-
 ...origin-downgrade.no-redirect.http.html.ini |  3 +-
 ...wngrade.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...upgrade.keep-origin-redirect.http.html.ini |  3 +-
 ...e-origin-upgrade.no-redirect.http.html.ini |  3 +-
 ...upgrade.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...wngrade.keep-origin-redirect.http.html.ini |  6 ---
 ...origin-downgrade.no-redirect.http.html.ini |  6 ---
 ...wngrade.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...upgrade.keep-origin-redirect.http.html.ini |  6 ---
 ...e-origin-upgrade.no-redirect.http.html.ini |  6 ---
 ...upgrade.swap-origin-redirect.http.html.ini |  6 ---
 ...wngrade.keep-origin-redirect.http.html.ini |  6 ---
 ...origin-downgrade.no-redirect.http.html.ini |  6 ---
 ...wngrade.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...upgrade.keep-origin-redirect.http.html.ini |  6 ---
 ...e-origin-upgrade.no-redirect.http.html.ini |  6 ---
 ...upgrade.swap-origin-redirect.http.html.ini |  6 ---
 ...wngrade.keep-origin-redirect.http.html.ini |  6 ---
 ...origin-downgrade.no-redirect.http.html.ini |  6 ---
 ...wngrade.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...upgrade.keep-origin-redirect.http.html.ini |  6 ---
 ...e-origin-upgrade.no-redirect.http.html.ini |  6 ---
 ...upgrade.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...wngrade.keep-origin-redirect.http.html.ini |  3 +-
 ...origin-downgrade.no-redirect.http.html.ini |  3 +-
 ...wngrade.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...upgrade.keep-origin-redirect.http.html.ini |  3 +-
 ...e-origin-upgrade.no-redirect.http.html.ini |  3 +-
 ...upgrade.swap-origin-redirect.http.html.ini |  3 +-
 ...wngrade.keep-origin-redirect.http.html.ini |  3 +-
 ...origin-downgrade.no-redirect.http.html.ini |  3 +-
 ...wngrade.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...upgrade.keep-origin-redirect.http.html.ini |  3 +-
 ...e-origin-upgrade.no-redirect.http.html.ini |  3 +-
 ...upgrade.swap-origin-redirect.http.html.ini |  3 +-
 ...wngrade.keep-origin-redirect.http.html.ini |  3 +-
 ...origin-downgrade.no-redirect.http.html.ini |  3 +-
 ...wngrade.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...upgrade.keep-origin-redirect.http.html.ini |  3 +-
 ...e-origin-upgrade.no-redirect.http.html.ini |  3 +-
 ...upgrade.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...wngrade.keep-origin-redirect.http.html.ini |  6 ---
 ...origin-downgrade.no-redirect.http.html.ini |  6 ---
 ...wngrade.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...upgrade.keep-origin-redirect.http.html.ini |  6 ---
 ...e-origin-upgrade.no-redirect.http.html.ini |  6 ---
 ...upgrade.swap-origin-redirect.http.html.ini |  6 ---
 ...wngrade.keep-origin-redirect.http.html.ini |  6 ---
 ...origin-downgrade.no-redirect.http.html.ini |  6 ---
 ...wngrade.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...upgrade.keep-origin-redirect.http.html.ini |  6 ---
 ...e-origin-upgrade.no-redirect.http.html.ini |  6 ---
 ...upgrade.swap-origin-redirect.http.html.ini |  6 ---
 ...wngrade.keep-origin-redirect.http.html.ini |  6 ---
 ...origin-downgrade.no-redirect.http.html.ini |  6 ---
 ...wngrade.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...upgrade.keep-origin-redirect.http.html.ini |  6 ---
 ...e-origin-upgrade.no-redirect.http.html.ini |  6 ---
 ...upgrade.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../a-tag/generic.no-redirect.http.html.ini   |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../a-tag/generic.no-redirect.http.html.ini   |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../a-tag/generic.no-redirect.http.html.ini   |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../a-tag/generic.no-redirect.http.html.ini   |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  3 +-
 .../generic.no-redirect.http.html.ini         |  3 +-
 ...generic.swap-origin-redirect.http.html.ini |  3 +-
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  3 +-
 .../cross-origin.no-redirect.http.html.ini    |  3 +-
 ...-origin.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...nsecure.swap-origin-redirect.http.html.ini |  3 +-
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...-origin.keep-origin-redirect.http.html.ini |  6 ---
 .../cross-origin.no-redirect.http.html.ini    |  6 ---
 ...-origin.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...nsecure.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../a-tag/generic.no-redirect.http.html.ini   |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...generic.keep-origin-redirect.http.html.ini |  6 ---
 .../generic.no-redirect.http.html.ini         |  6 ---
 ...generic.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 ...rotocol.keep-origin-redirect.http.html.ini |  6 ---
 ...upgrade-protocol.no-redirect.http.html.ini |  6 ---
 ...rotocol.swap-origin-redirect.http.html.ini |  6 ---
 553 files changed, 252 insertions(+), 2658 deletions(-)
 delete mode 100644 tests/wpt/metadata/cors/basic.htm.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/cors/cors-no-preflight-worker.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini

diff --git a/components/net/connector.rs b/components/net/connector.rs
index f74d0a28f90..a4b34605fd1 100644
--- a/components/net/connector.rs
+++ b/components/net/connector.rs
@@ -3,14 +3,53 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use hyper::client::Pool;
-use hyper::net::HttpsConnector;
+use hyper::error::{Result as HyperResult, Error as HyperError};
+use hyper::net::{NetworkConnector, HttpsStream, HttpStream, SslClient};
 use hyper_openssl::OpensslClient;
+use net_traits::hosts::replace_host;
 use openssl::ssl::{SSL_OP_NO_COMPRESSION, SSL_OP_NO_SSLV2, SSL_OP_NO_SSLV3};
 use openssl::ssl::{SslConnectorBuilder, SslMethod};
+use std::io;
+use std::net::TcpStream;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-pub type Connector = HttpsConnector<OpensslClient>;
+pub struct HttpsConnector {
+    ssl: OpensslClient,
+}
+
+impl HttpsConnector {
+    fn new(ssl: OpensslClient) -> HttpsConnector {
+        HttpsConnector {
+            ssl: ssl,
+        }
+    }
+}
+
+impl NetworkConnector for HttpsConnector {
+    type Stream = HttpsStream<<OpensslClient as SslClient>::Stream>;
+
+    fn connect(&self, host: &str, port: u16, scheme: &str) -> HyperResult<Self::Stream> {
+        if scheme != "http" && scheme != "https" {
+            return Err(HyperError::Io(io::Error::new(io::ErrorKind::InvalidInput,
+                                                     "Invalid scheme for Http")));
+        }
+
+        // Perform host replacement when making the actual TCP connection.
+        let addr = &(&*replace_host(host), port);
+        let stream = HttpStream(try!(TcpStream::connect(addr)));
+
+        if scheme == "http" {
+            Ok(HttpsStream::Http(stream))
+        } else {
+            // Do not perform host replacement on the host that is used
+            // for verifying any SSL certificate encountered.
+            self.ssl.wrap_client(stream, host).map(HttpsStream::Https)
+        }
+    }
+}
+
+pub type Connector = HttpsConnector;
 
 pub fn create_ssl_client(ca_file: &PathBuf) -> OpensslClient {
     let mut ssl_connector_builder = SslConnectorBuilder::new(SslMethod::tls()).unwrap();
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 059c4d1e830..3c09fc4ce7c 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -34,7 +34,6 @@ use hyper_serde::Serde;
 use log;
 use msg::constellation_msg::PipelineId;
 use net_traits::{CookieSource, FetchMetadata, NetworkError, ReferrerPolicy};
-use net_traits::hosts::replace_host;
 use net_traits::request::{CacheMode, CredentialsMode, Destination, Origin};
 use net_traits::request::{RedirectMode, Referrer, Request, RequestMode};
 use net_traits::request::{ResponseTainting, Type};
@@ -129,7 +128,7 @@ impl NetworkConnector for NetworkHttpRequestFactory {
     type Stream = PooledStream<HttpsStream<SslStream<HttpStream>>>;
 
     fn connect(&self, host: &str, port: u16, scheme: &str) -> Result<Self::Stream, HttpError> {
-        self.connector.connect(&replace_host(host), port, scheme)
+        self.connector.connect(host, port, scheme)
     }
 }
 
diff --git a/tests/wpt/metadata/cors/basic.htm.ini b/tests/wpt/metadata/cors/basic.htm.ini
deleted file mode 100644
index 8653d98cf33..00000000000
--- a/tests/wpt/metadata/cors/basic.htm.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[basic.htm]
-  type: testharness
-  [Cross domain different protocol]
-    expected: FAIL
-
-  [Same domain different protocol different port]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/mode-same-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/mode-same-origin-worker.html.ini
index c5ccd4a16f4..6ef33f97272 100644
--- a/tests/wpt/metadata/fetch/api/basic/mode-same-origin-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/mode-same-origin-worker.html.ini
@@ -3,3 +3,6 @@
   [Fetch http://www1.web-platform.test:8000/fetch/api/resources/top.txt with same-origin mode]
     expected: FAIL
 
+  [Fetch https://web-platform.test:8443/fetch/api/resources/top.txt with same-origin mode]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/basic/mode-same-origin.html.ini b/tests/wpt/metadata/fetch/api/basic/mode-same-origin.html.ini
index ed70030d4dc..8e906895520 100644
--- a/tests/wpt/metadata/fetch/api/basic/mode-same-origin.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/mode-same-origin.html.ini
@@ -3,3 +3,6 @@
   [Fetch http://www1.web-platform.test:8000/fetch/api/resources/top.txt with same-origin mode]
     expected: FAIL
 
+  [Fetch https://web-platform.test:8443/fetch/api/resources/top.txt with same-origin mode]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-basic-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-basic-worker.html.ini
index 85f5ab41ac1..77e557902f2 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-basic-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-basic-worker.html.ini
@@ -39,3 +39,9 @@
   [Cross domain different protocol [cors mode\]]
     expected: FAIL
 
+  [Same domain different protocol different port [server forbid CORS\]]
+    expected: FAIL
+
+  [Cross domain different protocol [server forbid CORS\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini
index 0b042261e06..efbdde07df0 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini
@@ -39,3 +39,9 @@
   [Cross domain different protocol [cors mode\]]
     expected: FAIL
 
+  [Same domain different protocol different port [server forbid CORS\]]
+    expected: FAIL
+
+  [Cross domain different protocol [server forbid CORS\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-no-preflight-worker.html.ini
deleted file mode 100644
index 1f9dd1a8bdb..00000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight-worker.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[cors-no-preflight-worker.html]
-  type: testharness
-  [Cross domain different protocol [GET\]]
-    expected: FAIL
-
-  [Same domain different protocol different port [GET\]]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini
deleted file mode 100644
index 5c35af97915..00000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[cors-no-preflight.html]
-  type: testharness
-  [Cross domain different protocol [GET\]]
-    expected: FAIL
-
-  [Same domain different protocol different port [GET\]]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-origin-worker.html.ini
index b2891aad31a..7d62c9b5ec8 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-origin-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-origin-worker.html.ini
@@ -9,12 +9,6 @@
   [Cross domain different port [origin KO\]]
     expected: FAIL
 
-  [Cross domain different protocol [origin OK\]]
-    expected: FAIL
-
-  [Same domain different protocol different port [origin OK\]]
-    expected: FAIL
-
   [Cross domain [POST\] [origin KO\]]
     expected: FAIL
 
@@ -27,3 +21,9 @@
   [Allowed origin: "" [origin KO\]]
     expected: FAIL
 
+  [Cross domain different protocol [origin KO\]]
+    expected: FAIL
+
+  [Same domain different protocol different port [origin KO\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini
index 19ca6c11344..edd4929042a 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini
@@ -9,12 +9,6 @@
   [Cross domain different port [origin KO\]]
     expected: FAIL
 
-  [Cross domain different protocol [origin OK\]]
-    expected: FAIL
-
-  [Same domain different protocol different port [origin OK\]]
-    expected: FAIL
-
   [Cross domain [POST\] [origin KO\]]
     expected: FAIL
 
@@ -27,3 +21,9 @@
   [Allowed origin: "" [origin KO\]]
     expected: FAIL
 
+  [Cross domain different protocol [origin KO\]]
+    expected: FAIL
+
+  [Same domain different protocol different port [origin KO\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/messageevent-constructor.https.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/messageevent-constructor.https.html.ini
index be450cad198..16104b329e4 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/messageevent-constructor.https.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/messageevent-constructor.https.html.ini
@@ -1,3 +1,23 @@
 [messageevent-constructor.https.html]
   type: testharness
-  expected: TIMEOUT
+  [Default event values]
+    expected: FAIL
+
+  [MessageEventInit dictionary]
+    expected: FAIL
+
+  [Passing null for ports member]
+    expected: FAIL
+
+  [ports attribute should be a FrozenArray]
+    expected: FAIL
+
+  [initMessageEvent operation]
+    expected: FAIL
+
+  [All parameters to initMessageEvent should be mandatory]
+    expected: FAIL
+
+  [Passing ServiceWorker for source member]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.serviceworker.https.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.serviceworker.https.html.ini
index 48d4cc68a34..62def3928b9 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.serviceworker.https.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/unhandled-promise-rejections/promise-rejection-events.serviceworker.https.html.ini
@@ -1,3 +1,5 @@
 [promise-rejection-events.serviceworker.https.html]
   type: testharness
-  expected: TIMEOUT
+  [Service worker setup]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 389ab7760a3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 51f66e1d7d6..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5a317c7258b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 3fbf793017c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 5725d94996f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index a95f8104ff7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 8a3484a5c0f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 07dd8402ed5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index f7b86a1d7d1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 790d6b228d7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 930cc8cc11f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index db309f6e28e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 4240bf0b470..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 47b8c6a203a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 35867391e26..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 7f5dcc22089..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 61b55be9827..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 32d3843a461..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index c28390b790c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 6147bf3526f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5e50b1eee06..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index f56ef8adbba..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 40f2a63e730..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 3d6fd433573..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 4701722ec04..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 521df8a1b07..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 53b70c12d94..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index d4b635ce63b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 01137d6aa87..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 6173c37cfbd..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 71c6db96aac..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 89e751e321f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5bd8722c23a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1ee4f5f3040..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 0ac81883ae3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index f03c2773c06..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 2a08f0000f1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 694959691d3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index d89627acf73..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 65fa3c81967..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index e9d3530d85c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 7effcc90102..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 4d1c464e1ce..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index ae91e2d7386..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 1022b3c8284..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 60bb60a1216..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 21029ba87b4..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 28b7bf9ee9a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index c4804478079..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 8647e42c3bc..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 89d77582b79..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 49d75a10521..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index c42f8b182ab..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index bd00b0fc983..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1522a2fca19..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 8409f0f1517..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 93027a3157f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 3523217b81d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index d7f5a039ebf..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index b032bd4e932..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 664767cdbf1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 189c7028597..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index a6013e21123..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 01ea405804b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index f20b94cbfb0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 05ddfc72b64..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index f843e6b0ce0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index ef363e8e699..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5ae2b5cdcdc..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index cc8a0f87608..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index fb52e7b863c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 44026f69721..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
index 80997a5ab7b..b4dd011ee48 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
index 391ea736c36..297c31b8706 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
index f3df479daab..9bb73226858 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 55716d574ae..fe77b9d49e9 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 3d073b9b318..ffae99993b6 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index e6ed38aab44..fa971027899 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
index f4b69e0bd21..3167485f37b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
index 790547a3cb4..130068cc3d1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
index cea4010c1fb..3bfcd2a1997 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
index cd112950989..d795d229def 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
index 8ae2b015d39..9fef9aa38b5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
index 2c25814d77f..dbcad7dbbad 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 363f3303671..721e74f4a03 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 27ac8ac9f75..a61c0148e4b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 722ebbd6e01..49875a6991d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
index 094cba18fb3..95263583ffe 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
index e81c74cafce..710839dbf4a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
index a068d545c67..dad683d6fe1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 5003426ff2c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 7e6b1b9877c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 134b396379e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 5ba4beb7c02..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 49cacbfddec..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index f71a1d914c3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index d5795172b43..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 3ac446ea64e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 0fe0f4eea03..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index a7265203246..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 1f53171de2a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index ba891f92dba..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index fc1b7001fb0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 923c89ec422..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index af4d51c6ea0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 0f218286533..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 8c759b4fa2f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 98aab9b3bd3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
index 1c8832aec8c..18cc91557c3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
index 18553d42ab4..b50e8a548b4 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
index 20c6df7181a..8a348c82f47 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 7eb99239ceb..aa5b4ad593a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index dc07e502de3..c2be8220516 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index a771f7429e8..873e2bdcbd5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
index eb22663e53d..2b26c5271a6 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
index 5ab343296f4..69678ea3fc5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
index 7e05a814964..c4e2221408b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
index 409897a975c..ed6f971c0d2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
index 1d6e1c1fe57..f687a1b7e55 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
index c392b422767..739a4659589 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index fbc094db14f..72e4b86394f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index b8cb9420419..654d033124b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 9b5ebd55291..e3dddc4abca 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
index afe5338a5ee..21baf55d21b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
index f2e7d65418d..20f050a2806 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
index 544ecd6592f..bafc693a455 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index b70573315f0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 0918c8d92ba..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 816cbd641f4..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 8488a035493..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index ac35eee583e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index eabca58f8ea..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index b53a0e6318b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index a7a97b9921d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 84db8ab8705..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 9f95210745d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 0f3134a73a4..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 995ee3ee080..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 69313c3d3e2..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index b2e4228fff2..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 2f2eccaf982..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 9542e0a7b64..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index cf085ff04b9..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 3690c805ea8..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 9f6c941b68c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 2ddead54489..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index e950d416a7a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 48cc33cb86c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the rel-noreferrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 10663321ec9..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the rel-noreferrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index d63149cef15..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the rel-noreferrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index fe0150442f0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 0a139c71f79..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index d107936f5a2..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the rel-noreferrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index e5b22967c39..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the rel-noreferrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 995f8914d63..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the rel-noreferrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 14cd819161d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/rel-noreferrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the rel-noreferrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
index 49f6ef7ba27..2c84e0011a9 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
index 441681a46b5..fe4702cbc73 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
index c6911382991..79ca00252d7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 56a46c13534..1dcd38315ff 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index efa882a54c8..46685b6fddc 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 9b808033791..36682797611 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
index 086034abc0e..cce018b3f49 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
index 9985cdbddf9..24301e64279 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
index 4704596c51e..c3e5112c916 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index 31ffe5ca164..20a50519515 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
index ac33169c755..d7f969ee38e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index c668c4fe68c..a7bd1d64bca 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 18072bd8209..ccfa0c20542 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index da57cdcdc19..81475477a5b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
index 757ce6d9ecf..d8c85528a3f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index 2182a32faaa..eea2a9e7e2f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index 87e580221f3..4552d54437a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
index a542b21878c..58ddf2b87b5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index d8e8aea1f8c..83bff1b06e5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index f832fe7a754..eb50e15b9e0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index 21131a7ef63..29fd2be7507 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
index 8ae2f91dec7..09a5fd7f2d8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index c8887a29de7..821d487f9a8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index 6da88c38239..28c74aa74e1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
index 2e7bad284af..03bfe73cc57 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index bdc9ec1db2c..8e7b08dfad2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 623da2035e6..3dbe9405897 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index d62bdfea6dc..eecbda2c8ad 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
index 9ee645d54e0..8a0b9e59963 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index fc31e0cb56a..98384d454c8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index fd2ff6d6784..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 98bcaca66ee..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 8feb6c09943..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 4330dc9125e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index bacc584a4e6..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 7fa94339a30..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 2a2ab7e9605..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index d5c330450a7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 109a328611f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 69ebc3b3ec3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
deleted file mode 100644
index a728cfb5763..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 0db7a59ba38..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 987c5160faa..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 4fd74b4d0c0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
deleted file mode 100644
index dd2f0834d90..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index f22957656ec..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 5352285d445..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
deleted file mode 100644
index aa244f1d3cf..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 198ef93a340..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 4aeda7a2021..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index fb872b0717e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
deleted file mode 100644
index 2a7f2a84135..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 1e217a2cd5d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 25a553f933c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
deleted file mode 100644
index 1d155a48087..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index fcc969eace9..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 7c4fcc5db84..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index c5098a9d7c2..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
deleted file mode 100644
index 5105cb31c0d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index cd4367a1985..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
index dc897a7040d..fab97a17a1b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
index c06ea8fcc80..24102d49616 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
index 188e8165934..538b14568ac 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 97bb96b0ce7..e23bc8919f8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index 1f222096c9d..95200066365 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 94347c1fa15..96a61fe3d6a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
index 1420d31b24d..06d1995336c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
index cf83e40c504..158dad674c8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
index 3bbca89e003..6bb8ffee0ea 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index ebb173b57c3..0e01d6773e6 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
index 7ff2fbb2fb3..ca1e8616686 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index 674c9d88faa..c2582454ab0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index ccea2caf737..ac1e3ceb467 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index 60079fdb5fc..7e8b7638520 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
index 2b1cdc80dc3..8905c1f19d5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index 4e842a05679..ef78600df1b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index fce729fb8c0..3bdeb94127a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
index 3f713480a76..480e06994a5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index d9f97b90e6d..461210460f0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index be634ec22ee..4fe8e03e38f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index b1e99964cfd..3aedbcdc9d5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
index dfa61163ae0..91bdd8bfcd8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index 33929677cf2..d2bcad82be8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index 9f89bdf8b00..399aebdf845 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
index c8600cce581..2410cf0f699 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index 86413b7c890..8d168d8e214 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index da4309c2a29..f09eadaca0d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index a37f43a0f58..0a9f698803d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
index 0a728baf579..bfc2a60e824 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index 62d60cd1374..a3330d539b3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 0f4215c381a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 3c7427dbd21..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 85048322a01..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 611839b3a3d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 8de34cab02f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 4f2f3e630b3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index e932cb8250e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index a358c443efd..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 11f2713441c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index f5b0185cc9f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
deleted file mode 100644
index 8e13f4f6a7a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 27595b9614f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index ef3f743f3ba..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 8dbd24c5672..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
deleted file mode 100644
index eeaa3f90b7c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index d3ad6b7f0f0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 667cee68e23..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
deleted file mode 100644
index 60f04e09f1f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 08ea69289c7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index e20b6e93eb8..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 058aa9a766d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
deleted file mode 100644
index f443e012295..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index c274d016f72..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index a5b335df3a8..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
deleted file mode 100644
index 9471d529827..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 721eff2eb86..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-downgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 61e8a31dab6..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 46f9f274698..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
deleted file mode 100644
index 340930a7867..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
deleted file mode 100644
index fedc63c2232..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-upgrade.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
index 1e411e72251..a6fda7f430e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
index 4be334d9a3f..f5d595c6545 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
index e9a92542b99..4cfb3119a0e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index a57e7b46d38..44db67618fc 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 676b7ed9c76..2dfb453f3c1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 7691443bbb0..ffbff083d33 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
index 3c042c647de..ce3e880354b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
index 986b6781dbd..2289990d498 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
index d1244845cc6..9fc54e85758 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
index 4b2ad37b7c1..b91cd8cfca7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
index 778922b76ec..c861690d136 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
index 0e604ee5949..a611d90d49c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 380b48684cd..18e39adc570 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index aa93b921fb2..7bfe801ee1f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 18e4cbb365c..539f11d0eec 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
index 85c0efb8fce..4526b3b24b2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
index b9d41502ee9..bfe391973bb 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
index 997f18e51ae..47682921f5f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 0190251db1d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index e87d2c349e5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 0162dfff19b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 62b591c38a5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 4c28991e0a3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 2a8b2d9677a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 6feca1103f0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 51e5b99595d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index d5932db6ca5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1970cafb02b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 7e36e93c16b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index ee618ac2315..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index f1632ef15c1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index afc1d2c4942..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 91cc3ddfb3e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1b034c16b2d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 3d02d0db0ad..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 60d316f1ba2..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
index 0a9f34c4c94..dcbcc11e90d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
index 2cfe55c35b0..0b1d57d542e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
index 1a06e64eb1e..70cd505a2e1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index eb7d1017492..602ea74cfaa 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 6abf8bbf7f5..bb502a70e90 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index b88d216923e..d2055141856 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
index a512f7dca9d..97e4dd1e130 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
index 865284e84b4..8040747e386 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
index 7a55d73862a..d13f59c327d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
index 57ad336a4bb..ed6e688f984 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
index 24523b1c7d2..0764ba3488c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
index 3d4a919fdb8..31dc0a662e0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 1888a1758b1..b1f9ac48d03 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 365330861e8..34099172232 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 129512b637b..f4bfa3470e7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
index ea3537674ae..14ea4b12823 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
index 725c2616a56..97a1e81e3a7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
index 375c124536d..bb837eacdcc 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 75017182745..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 23587bd154a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 9ff72fa7617..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 90ee5ca1fa3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 16e856a7d46..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 6616df93bbe..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 90efa0d0ec1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 60348d7978a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 918dec3c704..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 29cd86430f8..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index c5fc89cbc6c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 2e0c86f0984..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 32a8d561b73..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 314a6ed3433..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 07cbf044544..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index c36354e1218..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 32fbdd1be8c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index d3f33cc7eed..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
index 08973f74136..132705e7044 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
index cac08331e12..768edf67219 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
index ad76a077885..ac548cb073b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 54eb563bac5..58fef41694c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index d2aa836aa7d..4cc45e76e5f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 4ee2ec629a2..3e97d244a22 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
index c317fadcc3c..0a0937dd370 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
index 5876e9b66b2..01adec90b58 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
index 67ec78e7e2c..dc59f194275 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 2eafde98b14..7d281086cd7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 5fb75af7e66..b7c8de6922e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index dc3ae11ca4c..c5c45b7d4fb 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 550d9742b5a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 32f816b87d4..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index be13c481990..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 3a9de157e34..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index fd29c310a11..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 500ee3a4c83..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 195d8a993ab..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index e8bbcbc3781..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 7eec19d482b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 53683c59773..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5da6b778bab..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 234946bca26..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
index 85d263de21b..18e1ed66808 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
index 721c3dcfbcf..d812732462d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
index dfa125107db..6ec40c483a2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 9a03353dfac..6c0965c61e4 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index d6ba017e0c1..05ef7b708be 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index bb2eda3d519..5365dafc6f8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
index a2fa907f5a2..725864345ae 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
index 501da9ee390..bbd8dbd97bd 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
index f4afb7fcef7..aa045351636 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 254ddc059fd..6f9482fff4a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index d8e8aeb21ef..adedbbd7384 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 26cbc623f1a..f6b4634cf0c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index bc1e5404a8a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 6e9806d590d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 286c484d310..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 2cc93659f5a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index c43380e9aea..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5d7089e6623..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 6f6a1906e6b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index c6c0e04b392..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 0f38d69b463..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/link-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 709e09299d2..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/a-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index af8330dd16f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 8369f22e345..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/link-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 21923253063..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index d6c3eaf4167..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 8856cf0c0bb..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index f38d524bc20..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 924f16a2bf5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 650581c6db2..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 2c1f2c16bf2..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index aa6e03b2ce7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index cf099dd9220..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 60b2c64527a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 4043164af69..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index f0d1982982b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 9d7ca680799..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 2877fad090e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 05f793855af..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 5d6e7f8f72f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index fec4f63fc0a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index bab28f82ac8..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 5d32ed871c5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 2d73604ffc0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 4ca18fa5f50..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index b80d2c97b8e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index ced93450d46..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 1fa7e0e227e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 0fe8cc83edb..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 343d130f446..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 7971c4207db..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 88bdb6a1153..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 9c1343dcac9..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index c1eba098cb0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 5b2da0d1ded..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 500fc3c2fc1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 30bc4017cca..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 5ae0f705925..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 93080d5d475..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index e5f0f1679b7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1c4635290cb..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 3b09dadf314..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 462659bd713..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index fec6320f111..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 2e397915672..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index c54173a645e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index f550d571c80..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index aab9e513fd7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 3e1a1f08d37..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 8b61c027131..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 0205db6f7ec..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index c6f40bebd7f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 3bf3e6e6e83..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 004b521b870..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index c59b71dd1bc..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 7879a1ac8d6..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 1b4cc47d529..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 89b94cf7ed7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index b8444594a2b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 879d1429c4a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 44ee269caf8..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1ff8ce818c6..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 22fb74a2781..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 488d29ef46d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 599ec04dcaf..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 9da942458de..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 051f05578c1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1b9c66880bc..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index f1929e90f80..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 2216e541c6e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 5d94291eb9a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 9299241a4e1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index a075d157d77..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 2d18e1f4272..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 6781d8825cd..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 4ab00e106ef..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/link-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 389ab7760a3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 51f66e1d7d6..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5a317c7258b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 3fbf793017c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 5725d94996f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index a95f8104ff7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 8a3484a5c0f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 07dd8402ed5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index f7b86a1d7d1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 790d6b228d7..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 930cc8cc11f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index db309f6e28e..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 4240bf0b470..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 47b8c6a203a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 35867391e26..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 7f5dcc22089..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 61b55be9827..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 32d3843a461..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index c28390b790c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 6147bf3526f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5e50b1eee06..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index f56ef8adbba..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 40f2a63e730..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 3d6fd433573..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 4701722ec04..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 521df8a1b07..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 53b70c12d94..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index d4b635ce63b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 01137d6aa87..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 6173c37cfbd..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 71c6db96aac..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 89e751e321f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5bd8722c23a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1ee4f5f3040..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 0ac81883ae3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index f03c2773c06..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 2a08f0000f1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 694959691d3..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index d89627acf73..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 65fa3c81967..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index e9d3530d85c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 7effcc90102..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 4d1c464e1ce..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index ae91e2d7386..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 1022b3c8284..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 60bb60a1216..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 21029ba87b4..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 28b7bf9ee9a..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index c4804478079..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 8647e42c3bc..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 89d77582b79..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 49d75a10521..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index c42f8b182ab..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index bd00b0fc983..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1522a2fca19..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 8409f0f1517..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 93027a3157f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 3523217b81d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index d7f5a039ebf..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index b032bd4e932..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 664767cdbf1..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 189c7028597..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index a6013e21123..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 01ea405804b..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index f20b94cbfb0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 05ddfc72b64..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index f843e6b0ce0..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index ef363e8e699..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5ae2b5cdcdc..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: ERROR
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index cc8a0f87608..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
deleted file mode 100644
index fb52e7b863c..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 44026f69721..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/link-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via link-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-