From 3216009731664d5099049267bca7a79e6af22196 Mon Sep 17 00:00:00 2001
From: Jeena Lee <ijeenalee@gmail.com>
Date: Tue, 6 Sep 2016 10:54:06 -0700
Subject: [PATCH] Implement the Fetch method

---
 components/script/dom/headers.rs              |   4 +
 components/script/dom/request.rs              |   4 +
 components/script/dom/response.rs             |  23 ++
 components/script/dom/webidls/Fetch.webidl    |  11 +
 .../webidls/WindowOrWorkerGlobalScope.webidl  |  30 +++
 components/script/dom/window.rs               |  10 +
 components/script/dom/workerglobalscope.rs    |  12 +-
 components/script/fetch.rs                    | 172 ++++++++++++
 components/script/lib.rs                      |   1 +
 tests/wpt/include.ini                         |   6 +
 .../fetch/api/basic/integrity-worker.html.ini |  27 --
 .../fetch/api/basic/integrity.html.ini        |  27 --
 .../basic/mode-same-origin-worker.html.ini    |   9 -
 .../fetch/api/basic/mode-same-origin.html.ini |   9 -
 .../fetch/api/basic/referrer-worker.html.ini  |   6 -
 .../fetch/api/basic/referrer.html.ini         |   6 -
 .../api/basic/request-head-worker.html.ini    |   5 -
 .../fetch/api/basic/request-head.html.ini     |   5 -
 .../fetch/api/basic/request-referrer.html.ini |   3 -
 .../api/basic/response-url-worker.html.ini    |  14 -
 .../fetch/api/basic/response-url.html.ini     |  14 -
 .../api/basic/scheme-about-worker.html.ini    |  12 -
 .../fetch/api/basic/scheme-about.html.ini     |  12 -
 .../api/basic/scheme-blob-worker.html.ini     |  25 +-
 .../fetch/api/basic/scheme-blob.html.ini      |  25 +-
 .../api/basic/scheme-data-worker.html.ini     |   9 -
 .../fetch/api/basic/scheme-data.html.ini      |   9 -
 .../api/basic/scheme-others-worker.html.ini   |  50 ----
 .../fetch/api/basic/scheme-others.html.ini    |  50 ----
 .../fetch/api/cors/cors-basic-worker.html.ini |   6 -
 .../fetch/api/cors/cors-basic.html.ini        |   6 -
 .../api/cors/cors-cookies-worker.html.ini     |  15 --
 .../fetch/api/cors/cors-cookies.html.ini      |  15 --
 .../cors-multiple-origins-worker.html.ini     |  15 --
 .../api/cors/cors-multiple-origins.html.ini   |  15 --
 .../cors/cors-no-preflight-worker.html.ini    |  39 ---
 .../fetch/api/cors/cors-no-preflight.html.ini |  39 ---
 .../api/cors/cors-origin-worker.html.ini      |  24 --
 .../fetch/api/cors/cors-origin.html.ini       |  24 --
 .../cors-preflight-redirect-worker.html.ini   |  32 ---
 .../api/cors/cors-preflight-redirect.html.ini |  32 ---
 .../cors-preflight-status-worker.html.ini     |  83 ------
 .../api/cors/cors-preflight-status.html.ini   |  83 ------
 .../api/cors/cors-preflight-worker.html.ini   |   6 -
 .../fetch/api/cors/cors-preflight.html.ini    |   6 -
 .../cors-redirect-credentials-worker.html.ini | 135 ----------
 .../cors/cors-redirect-credentials.html.ini   | 135 ----------
 .../api/cors/cors-redirect-worker.html.ini    |  62 -----
 .../fetch/api/cors/cors-redirect.html.ini     |  62 -----
 .../policies/referrer-origin-worker.html.ini  |   3 -
 .../api/policies/referrer-origin.html.ini     |   3 -
 .../redirect/redirect-count-worker.html.ini   |  32 ---
 .../api/redirect/redirect-count.html.ini      |  32 ---
 .../redirect-location-worker.html.ini         |  63 +----
 .../api/redirect/redirect-location.html.ini   |  63 +----
 .../redirect/redirect-method-worker.html.ini  |   3 -
 .../api/redirect/redirect-method.html.ini     |   3 -
 .../redirect/redirect-mode-worker.html.ini    |  15 --
 .../fetch/api/redirect/redirect-mode.html.ini |  15 --
 .../redirect/redirect-origin-worker.html.ini  |  15 --
 .../api/redirect/redirect-origin.html.ini     |  15 --
 .../api/redirect/redirect-schemes.html.ini    |  15 --
 .../redirect-to-dataurl-worker.html.ini       |   9 -
 .../api/redirect/redirect-to-dataurl.html.ini |   9 -
 .../fetch/api/request/request-cache.html.ini  | 248 +-----------------
 .../api/request/request-consume.html.ini      |  80 +++---
 .../response/response-consume-stream.html.ini |   6 +-
 .../response-stream-disturbed-5.html.ini      |   9 -
 ...rotocol.keep-origin-redirect.http.html.ini |   6 +
 ...nsecure-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 +
 ...nsecure-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 |   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 +
 .../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 |   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.keep-origin-redirect.http.html.ini |   6 +
 ...-origin-insecure.no-redirect.http.html.ini |   6 +
 ...nsecure.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 |   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 +
 .../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 +
 .../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 |   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.keep-origin-redirect.http.html.ini |   6 +
 ...-origin-insecure.no-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 |   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.keep-origin-redirect.http.html.ini |   6 +
 ...-origin-insecure.no-redirect.http.html.ini |   6 +
 ...nsecure.swap-origin-redirect.http.html.ini |   6 +
 ...nsecure.swap-origin-redirect.http.html.ini |   6 +
 ...nsecure.keep-origin-redirect.http.html.ini |   6 +
 .../cross-insecure.no-redirect.http.html.ini  |   6 +
 ...nsecure.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 +
 ...nsecure.keep-origin-redirect.http.html.ini |   6 +
 .../same-insecure.no-redirect.http.html.ini   |   6 +
 ...nsecure.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 +
 ...nsecure.keep-origin-redirect.http.html.ini |   6 +
 .../cross-insecure.no-redirect.http.html.ini  |   6 +
 ...nsecure.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 +
 ...nsecure.keep-origin-redirect.http.html.ini |   6 +
 .../same-insecure.no-redirect.http.html.ini   |   6 +
 ...nsecure.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 +
 ...nsecure-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 +
 ...nsecure-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 +
 ...nsecure-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 +
 ...nsecure-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 |   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 +
 .../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-clean-conformance.html.ini         |   1 -
 213 files changed, 1208 insertions(+), 1719 deletions(-)
 create mode 100644 components/script/dom/webidls/Fetch.webidl
 create mode 100644 components/script/dom/webidls/WindowOrWorkerGlobalScope.webidl
 create mode 100644 components/script/fetch.rs
 delete mode 100644 tests/wpt/metadata/fetch/api/basic/request-head-worker.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/basic/request-head.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/basic/response-url-worker.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/basic/response-url.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/basic/scheme-others-worker.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/basic/scheme-others.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect-worker.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/cors/cors-preflight-status-worker.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/cors/cors-preflight-status.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
 create mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini

diff --git a/components/script/dom/headers.rs b/components/script/dom/headers.rs
index 4b832121654..7f43dd6b07a 100644
--- a/components/script/dom/headers.rs
+++ b/components/script/dom/headers.rs
@@ -229,6 +229,10 @@ impl Headers {
         *self.header_list.borrow_mut() = HyperHeaders::new();
     }
 
+    pub fn set_headers(&self, hyper_headers: HyperHeaders) {
+        *self.header_list.borrow_mut() = hyper_headers;
+    }
+
     // https://fetch.spec.whatwg.org/#concept-header-extract-mime-type
     pub fn extract_mime_type(&self) -> Vec<u8> {
         self.header_list.borrow().get_raw("content-type").map_or(vec![], |v| v[0].clone())
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs
index 3cb802a84f9..4ffbeb2dcd1 100644
--- a/components/script/dom/request.rs
+++ b/components/script/dom/request.rs
@@ -445,6 +445,10 @@ impl Request {
         r_clone.Headers().set_guard(headers_guard);
         r_clone
     }
+
+    pub fn get_request(&self) -> NetTraitsRequest {
+        self.request.borrow().clone()
+    }
 }
 
 fn net_request_from_global(global: GlobalRef,
diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs
index d020f932f37..b8eeb81fb66 100644
--- a/components/script/dom/response.rs
+++ b/components/script/dom/response.rs
@@ -18,7 +18,9 @@ use dom::headers::{Headers, Guard};
 use dom::headers::{is_vchar, is_obs_text};
 use dom::promise::Promise;
 use dom::xmlhttprequest::Extractable;
+use hyper::header::Headers as HyperHeaders;
 use hyper::status::StatusCode;
+use hyper_serde::Serde;
 use net_traits::response::{ResponseBody as NetTraitsResponseBody};
 use std::mem;
 use std::rc::Rc;
@@ -344,3 +346,24 @@ impl ResponseMethods for Response {
 fn serialize_without_fragment(url: &Url) -> &str {
     &url[..Position::AfterQuery]
 }
+
+impl Response {
+    pub fn set_type(&self, new_response_type: DOMResponseType) {
+        *self.response_type.borrow_mut() = new_response_type;
+    }
+
+    pub fn set_headers(&self, option_hyper_headers: Option<Serde<HyperHeaders>>) {
+        self.Headers().set_headers(match option_hyper_headers {
+            Some(hyper_headers) => hyper_headers.into_inner(),
+            None => HyperHeaders::new(),
+        });
+    }
+
+    pub fn set_raw_status(&self, status: Option<(u16, Vec<u8>)>) {
+        *self.raw_status.borrow_mut() = status;
+    }
+
+    pub fn set_final_url(&self, final_url: Url) {
+        *self.url.borrow_mut() = Some(final_url);
+    }
+}
diff --git a/components/script/dom/webidls/Fetch.webidl b/components/script/dom/webidls/Fetch.webidl
new file mode 100644
index 00000000000..fe062994598
--- /dev/null
+++ b/components/script/dom/webidls/Fetch.webidl
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// https://fetch.spec.whatwg.org/#fetch-method
+
+[Exposed=(Window,Worker)]
+
+partial interface WindowOrWorkerGlobalScope {
+  [NewObject] Promise<Response> fetch(RequestInfo input, optional RequestInit init);
+};
diff --git a/components/script/dom/webidls/WindowOrWorkerGlobalScope.webidl b/components/script/dom/webidls/WindowOrWorkerGlobalScope.webidl
new file mode 100644
index 00000000000..f0b8218fbe2
--- /dev/null
+++ b/components/script/dom/webidls/WindowOrWorkerGlobalScope.webidl
@@ -0,0 +1,30 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// https://html.spec.whatwg.org/multipage/#windoworworkerglobalscope
+
+// typedef (DOMString or Function) TimerHandler;
+
+[NoInterfaceObject, Exposed=(Window,Worker)]
+interface WindowOrWorkerGlobalScope {
+  // [Replaceable] readonly attribute USVString origin;
+
+  // base64 utility methods
+  // DOMString btoa(DOMString data);
+  // DOMString atob(DOMString data);
+
+  // timers
+  // long setTimeout(TimerHandler handler, optional long timeout = 0, any... arguments);
+  // void clearTimeout(optional long handle = 0);
+  // long setInterval(TimerHandler handler, optional long timeout = 0, any... arguments);
+  // void clearInterval(optional long handle = 0);
+
+  // ImageBitmap
+  // Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, optional ImageBitmapOptions options);
+  // Promise<ImageBitmap> createImageBitmap(
+  //   ImageBitmapSource image, long sx, long sy, long sw, long sh, optional ImageBitmapOptions options);
+};
+
+Window implements WindowOrWorkerGlobalScope;
+WorkerGlobalScope implements WindowOrWorkerGlobalScope;
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 3e841116acd..30d51a31c4c 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -12,8 +12,10 @@ use dom::bindings::codegen::Bindings::EventHandlerBinding::OnBeforeUnloadEventHa
 use dom::bindings::codegen::Bindings::EventHandlerBinding::OnErrorEventHandlerNonNull;
 use dom::bindings::codegen::Bindings::FunctionBinding::Function;
 use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
+use dom::bindings::codegen::Bindings::RequestBinding::RequestInit;
 use dom::bindings::codegen::Bindings::WindowBinding::{self, FrameRequestCallback, WindowMethods};
 use dom::bindings::codegen::Bindings::WindowBinding::{ScrollBehavior, ScrollToOptions};
+use dom::bindings::codegen::UnionTypes::RequestOrUSVString;
 use dom::bindings::error::{Error, ErrorInfo, ErrorResult, Fallible, report_pending_exception};
 use dom::bindings::global::{GlobalRef, global_root_from_object};
 use dom::bindings::inheritance::Castable;
@@ -40,9 +42,11 @@ use dom::messageevent::MessageEvent;
 use dom::navigator::Navigator;
 use dom::node::{Node, from_untrusted_node_address, window_from_node};
 use dom::performance::Performance;
+use dom::promise::Promise;
 use dom::screen::Screen;
 use dom::storage::Storage;
 use euclid::{Point2D, Rect, Size2D};
+use fetch;
 use gfx_traits::LayerId;
 use ipc_channel::ipc::{self, IpcSender};
 use js::jsapi::{Evaluate2, HandleObject, HandleValue, JSAutoCompartment, JSContext};
@@ -902,6 +906,12 @@ impl WindowMethods for Window {
             Err(e) => Err(Error::Type(format!("Couldn't open URL: {}", e))),
         }
     }
+
+    #[allow(unrooted_must_root)]
+    // https://fetch.spec.whatwg.org/#fetch-method
+    fn Fetch(&self, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> {
+        fetch::Fetch(self.global().r(), input, init)
+    }
 }
 
 pub trait ScriptHelpers {
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs
index 2520f57dbac..f2809537316 100644
--- a/components/script/dom/workerglobalscope.rs
+++ b/components/script/dom/workerglobalscope.rs
@@ -5,8 +5,10 @@
 use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId};
 use dom::bindings::codegen::Bindings::EventHandlerBinding::OnErrorEventHandlerNonNull;
 use dom::bindings::codegen::Bindings::FunctionBinding::Function;
+use dom::bindings::codegen::Bindings::RequestBinding::RequestInit;
 use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods;
-use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception, ErrorInfo};
+use dom::bindings::codegen::UnionTypes::RequestOrUSVString;
+use dom::bindings::error::{Error, ErrorInfo, ErrorResult, Fallible, report_pending_exception};
 use dom::bindings::global::{GlobalRef, GlobalRoot};
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{JS, MutNullableHeap, Root};
@@ -17,10 +19,12 @@ use dom::console::TimerSet;
 use dom::crypto::Crypto;
 use dom::dedicatedworkerglobalscope::DedicatedWorkerGlobalScope;
 use dom::eventtarget::EventTarget;
+use dom::promise::Promise;
 use dom::serviceworkerglobalscope::ServiceWorkerGlobalScope;
 use dom::window::{base64_atob, base64_btoa};
 use dom::workerlocation::WorkerLocation;
 use dom::workernavigator::WorkerNavigator;
+use fetch;
 use ipc_channel::ipc::IpcSender;
 use js::jsapi::{HandleValue, JSAutoCompartment, JSContext, JSRuntime};
 use js::jsval::UndefinedValue;
@@ -393,6 +397,12 @@ impl WorkerGlobalScopeMethods for WorkerGlobalScope {
     fn ClearInterval(&self, handle: i32) {
         self.ClearTimeout(handle);
     }
+
+    #[allow(unrooted_must_root)]
+    // https://fetch.spec.whatwg.org/#fetch-method
+    fn Fetch(&self, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> {
+        fetch::Fetch(self.global().r(), input, init)
+    }
 }
 
 
diff --git a/components/script/fetch.rs b/components/script/fetch.rs
new file mode 100644
index 00000000000..1117d050319
--- /dev/null
+++ b/components/script/fetch.rs
@@ -0,0 +1,172 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use dom::bindings::codegen::Bindings::RequestBinding::RequestInit;
+use dom::bindings::codegen::Bindings::ResponseBinding::ResponseBinding::ResponseMethods;
+use dom::bindings::codegen::Bindings::ResponseBinding::ResponseType as DOMResponseType;
+use dom::bindings::codegen::UnionTypes::RequestOrUSVString;
+use dom::bindings::error::Error;
+use dom::bindings::global::GlobalRef;
+use dom::bindings::js::Root;
+use dom::bindings::refcounted::{Trusted, TrustedPromise};
+use dom::bindings::reflector::Reflectable;
+use dom::headers::Guard;
+use dom::promise::Promise;
+use dom::request::Request;
+use dom::response::Response;
+use ipc_channel::ipc;
+use ipc_channel::router::ROUTER;
+use js::jsapi::JSAutoCompartment;
+use net_traits::{FetchResponseListener, NetworkError};
+use net_traits::{FilteredMetadata, FetchMetadata, Metadata};
+use net_traits::CoreResourceMsg::Fetch as NetTraitsFetch;
+use net_traits::request::Request as NetTraitsRequest;
+use net_traits::request::RequestInit as NetTraitsRequestInit;
+use network_listener::{NetworkListener, PreInvoke};
+use std::rc::Rc;
+use std::sync::{Arc, Mutex};
+use url::Url;
+
+struct FetchContext {
+    fetch_promise: Option<TrustedPromise>,
+    response_object: Trusted<Response>,
+}
+
+fn from_referrer_to_referrer_url(request: &NetTraitsRequest) -> Option<Url> {
+    let referrer = request.referrer.borrow();
+    referrer.to_url().map(|url| url.clone())
+}
+
+fn request_init_from_request(request: NetTraitsRequest) -> NetTraitsRequestInit {
+    NetTraitsRequestInit {
+        method: request.method.borrow().clone(),
+        url: request.url(),
+        headers: request.headers.borrow().clone(),
+        unsafe_request: request.unsafe_request,
+        same_origin_data: request.same_origin_data.get(),
+        body: request.body.borrow().clone(),
+        type_: request.type_,
+        destination: request.destination,
+        synchronous: request.synchronous,
+        mode: request.mode,
+        use_cors_preflight: request.use_cors_preflight,
+        credentials_mode: request.credentials_mode,
+        use_url_credentials: request.use_url_credentials,
+        // TODO: NetTraitsRequestInit and NetTraitsRequest have different "origin"
+        // ... NetTraitsRequestInit.origin: Url
+        // ... NetTraitsRequest.origin: RefCell<Origin>
+        origin: request.url(),
+        referrer_url: from_referrer_to_referrer_url(&request),
+        referrer_policy: request.referrer_policy.get(),
+        pipeline_id: request.pipeline_id.get(),
+    }
+}
+
+// https://fetch.spec.whatwg.org/#fetch-method
+#[allow(unrooted_must_root)]
+pub fn Fetch(global: GlobalRef, input: RequestOrUSVString, init: &RequestInit) -> Rc<Promise> {
+    let core_resource_thread = global.core_resource_thread();
+
+    // Step 1
+    let promise = Promise::new(global);
+    let response = Response::new(global);
+
+    // Step 2
+    let request = match Request::Constructor(global, input, init) {
+        Err(e) => {
+            promise.reject_error(promise.global().r().get_cx(), e);
+            return promise;
+        },
+        Ok(r) => r.get_request(),
+    };
+    let request_init = request_init_from_request(request);
+
+    // Step 3
+    response.Headers().set_guard(Guard::Immutable);
+
+    // Step 4
+    let (action_sender, action_receiver) = ipc::channel().unwrap();
+    let fetch_context = Arc::new(Mutex::new(FetchContext {
+        fetch_promise: Some(TrustedPromise::new(promise.clone())),
+        response_object: Trusted::new(&*response),
+    }));
+    let listener = NetworkListener {
+        context: fetch_context,
+        script_chan: global.networking_task_source(),
+        wrapper: None,
+    };
+
+    ROUTER.add_route(action_receiver.to_opaque(), box move |message| {
+        listener.notify_fetch(message.to().unwrap());
+    });
+    core_resource_thread.send(NetTraitsFetch(request_init, action_sender)).unwrap();
+
+    promise
+}
+
+impl PreInvoke for FetchContext {}
+
+impl FetchResponseListener for FetchContext {
+    fn process_request_body(&mut self) {
+        // TODO
+    }
+
+    fn process_request_eof(&mut self) {
+        // TODO
+    }
+
+    #[allow(unrooted_must_root)]
+    fn process_response(&mut self, fetch_metadata: Result<FetchMetadata, NetworkError>) {
+        let promise = self.fetch_promise.take().expect("fetch promise is missing").root();
+
+        // JSAutoCompartment needs to be manually made.
+        // Otherwise, Servo will crash.
+        let promise_cx = promise.global().r().get_cx();
+        let _ac = JSAutoCompartment::new(promise_cx, promise.reflector().get_jsobject().get());
+        match fetch_metadata {
+            // Step 4.1
+            Err(_) => {
+                promise.reject_error(
+                    promise.global().r().get_cx(),
+                    Error::Type("Network error occurred".to_string()));
+                self.fetch_promise = Some(TrustedPromise::new(promise));
+                return;
+            },
+            // Step 4.2
+            Ok(metadata) => {
+                match metadata {
+                    FetchMetadata::Unfiltered(m) =>
+                        fill_headers_with_metadata(self.response_object.root(), m),
+                    FetchMetadata::Filtered { filtered, .. } => match filtered {
+                        FilteredMetadata::Transparent(m) =>
+                            fill_headers_with_metadata(self.response_object.root(), m),
+                        FilteredMetadata::Opaque =>
+                            self.response_object.root().set_type(DOMResponseType::Opaque),
+                    }
+                }
+            }
+        }
+        // Step 4.3
+        promise.resolve_native(
+            promise_cx,
+            &self.response_object.root());
+        self.fetch_promise = Some(TrustedPromise::new(promise));
+    }
+
+    fn process_response_chunk(&mut self, mut chunk: Vec<u8>) {
+        // TODO when body is implemented
+        // ... this will append the chunk to Response's body.
+    }
+
+    fn process_response_eof(&mut self, response: Result<(), NetworkError>) {
+        // TODO
+        // ... trailerObject is not supported in Servo yet.
+    }
+}
+
+fn fill_headers_with_metadata(r: Root<Response>, m: Metadata) {
+    r.set_headers(m.headers);
+    r.set_raw_status(m.status);
+    r.set_final_url(m.final_url);
+}
diff --git a/components/script/lib.rs b/components/script/lib.rs
index eaa9a8f1f8b..234f6c0f224 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -98,6 +98,7 @@ mod devtools;
 pub mod document_loader;
 #[macro_use]
 pub mod dom;
+pub mod fetch;
 pub mod layout_wrapper;
 mod mem;
 mod network_listener;
diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini
index c784afdaad7..89a6081265c 100644
--- a/tests/wpt/include.ini
+++ b/tests/wpt/include.ini
@@ -19,6 +19,12 @@ skip: true
   skip: false
 [fetch]
   skip: false
+  [api]
+    skip: false
+    [cors]
+      skip: true
+    [redirect]
+      skip: true
 [FileAPI]
   skip: false
 [hr-time]
diff --git a/tests/wpt/metadata/fetch/api/basic/integrity-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/integrity-worker.html.ini
index 9191c848869..ac2c3309cd9 100644
--- a/tests/wpt/metadata/fetch/api/basic/integrity-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/integrity-worker.html.ini
@@ -1,41 +1,14 @@
 [integrity-worker.html]
   type: testharness
-  [Empty string integrity]
-    expected: FAIL
-
-  [SHA-256 integrity]
-    expected: FAIL
-
-  [SHA-384 integrity]
-    expected: FAIL
-
-  [SHA-512 integrity]
-    expected: FAIL
-
   [Invalid integrity]
     expected: FAIL
 
-  [Multiple integrities: valid stronger than invalid]
-    expected: FAIL
-
   [Multiple integrities: invalid stronger than valid]
     expected: FAIL
 
-  [Multiple integrities: invalid as strong as valid]
-    expected: FAIL
-
-  [Multiple integrities: both are valid]
-    expected: FAIL
-
   [Multiple integrities: both are invalid]
     expected: FAIL
 
-  [CORS empty integrity]
-    expected: FAIL
-
-  [CORS SHA-512 integrity]
-    expected: FAIL
-
   [CORS invalid integrity]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/basic/integrity.html.ini b/tests/wpt/metadata/fetch/api/basic/integrity.html.ini
index 1fc0b80308f..caefc524dc1 100644
--- a/tests/wpt/metadata/fetch/api/basic/integrity.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/integrity.html.ini
@@ -1,41 +1,14 @@
 [integrity.html]
   type: testharness
-  [Empty string integrity]
-    expected: FAIL
-
-  [SHA-256 integrity]
-    expected: FAIL
-
-  [SHA-384 integrity]
-    expected: FAIL
-
-  [SHA-512 integrity]
-    expected: FAIL
-
   [Invalid integrity]
     expected: FAIL
 
-  [Multiple integrities: valid stronger than invalid]
-    expected: FAIL
-
   [Multiple integrities: invalid stronger than valid]
     expected: FAIL
 
-  [Multiple integrities: invalid as strong as valid]
-    expected: FAIL
-
-  [Multiple integrities: both are valid]
-    expected: FAIL
-
   [Multiple integrities: both are invalid]
     expected: FAIL
 
-  [CORS empty integrity]
-    expected: FAIL
-
-  [CORS SHA-512 integrity]
-    expected: FAIL
-
   [CORS invalid integrity]
     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 216b03b6cec..3e556156baf 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
@@ -6,9 +6,6 @@
   [Fetch http://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
-
   [Fetch http://www1.web-platform.test:8000/fetch/api/resources/top.txt with same-origin mode]
     expected: FAIL
 
@@ -18,9 +15,3 @@
   [Fetch /fetch/api/basic/../resources/redirect.py?location=http://web-platform.test:8000/fetch/api/resources/top.txt with same-origin mode]
     expected: FAIL
 
-  [Fetch /fetch/api/basic/../resources/redirect.py?location=https://web-platform.test:8443/fetch/api/resources/top.txt with same-origin mode]
-    expected: FAIL
-
-  [Fetch /fetch/api/basic/../resources/redirect.py?location=http://www1.web-platform.test:8000/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 ff6b07df137..67aa845fb6a 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
@@ -6,9 +6,6 @@
   [Fetch http://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
-
   [Fetch http://www1.web-platform.test:8000/fetch/api/resources/top.txt with same-origin mode]
     expected: FAIL
 
@@ -18,9 +15,3 @@
   [Fetch /fetch/api/basic/../resources/redirect.py?location=http://web-platform.test:8000/fetch/api/resources/top.txt with same-origin mode]
     expected: FAIL
 
-  [Fetch /fetch/api/basic/../resources/redirect.py?location=https://web-platform.test:8443/fetch/api/resources/top.txt with same-origin mode]
-    expected: FAIL
-
-  [Fetch /fetch/api/basic/../resources/redirect.py?location=http://www1.web-platform.test:8000/fetch/api/resources/top.txt with same-origin mode]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/referrer-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/referrer-worker.html.ini
index 821017f5a0e..635316c1eb6 100644
--- a/tests/wpt/metadata/fetch/api/basic/referrer-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/referrer-worker.html.ini
@@ -12,9 +12,3 @@
   [origin-when-cross-origin policy on a same-origin URL after cross-origin redirection]
     expected: FAIL
 
-  [Referrer with credentials should be stripped]
-    expected: FAIL
-
-  [Referrer with fragment ID should be stripped]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/referrer.html.ini b/tests/wpt/metadata/fetch/api/basic/referrer.html.ini
index df439e25d51..42e3ce93fac 100644
--- a/tests/wpt/metadata/fetch/api/basic/referrer.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/referrer.html.ini
@@ -12,9 +12,3 @@
   [origin-when-cross-origin policy on a same-origin URL after cross-origin redirection]
     expected: FAIL
 
-  [Referrer with credentials should be stripped]
-    expected: FAIL
-
-  [Referrer with fragment ID should be stripped]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/request-head-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/request-head-worker.html.ini
deleted file mode 100644
index 3821a8e3ac2..00000000000
--- a/tests/wpt/metadata/fetch/api/basic/request-head-worker.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[request-head-worker.html]
-  type: testharness
-  [Fetch with HEAD with body]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/request-head.html.ini b/tests/wpt/metadata/fetch/api/basic/request-head.html.ini
deleted file mode 100644
index 373ae42b0a8..00000000000
--- a/tests/wpt/metadata/fetch/api/basic/request-head.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[request-head.html]
-  type: testharness
-  [Fetch with HEAD with body]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/request-referrer.html.ini b/tests/wpt/metadata/fetch/api/basic/request-referrer.html.ini
index 99a3dce06db..4cd73ee2a8d 100644
--- a/tests/wpt/metadata/fetch/api/basic/request-referrer.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/request-referrer.html.ini
@@ -3,6 +3,3 @@
   [Fetch: fetch() respects Request referrer value]
     expected: FAIL
 
-  [Fetch: fetch() respects Request referrer value 1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/response-url-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/response-url-worker.html.ini
deleted file mode 100644
index cb90797038f..00000000000
--- a/tests/wpt/metadata/fetch/api/basic/response-url-worker.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[response-url-worker.html]
-  type: testharness
-  [Testing response url getter with http://web-platform.test:8000/ada]
-    expected: FAIL
-
-  [Testing response url getter with http://web-platform.test:8000/#]
-    expected: FAIL
-
-  [Testing response url getter with http://web-platform.test:8000/#ada]
-    expected: FAIL
-
-  [Testing response url getter with http://web-platform.test:8000#ada]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/response-url.html.ini b/tests/wpt/metadata/fetch/api/basic/response-url.html.ini
deleted file mode 100644
index 4764b8e4d37..00000000000
--- a/tests/wpt/metadata/fetch/api/basic/response-url.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[response-url.html]
-  type: testharness
-  [Testing response url getter with http://web-platform.test:8000/ada]
-    expected: FAIL
-
-  [Testing response url getter with http://web-platform.test:8000/#]
-    expected: FAIL
-
-  [Testing response url getter with http://web-platform.test:8000/#ada]
-    expected: FAIL
-
-  [Testing response url getter with http://web-platform.test:8000#ada]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-about-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-about-worker.html.ini
index 162cec8dd3e..070fed03000 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-about-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-about-worker.html.ini
@@ -1,8 +1,5 @@
 [scheme-about-worker.html]
   type: testharness
-  [Fetching about:blank is OK]
-    expected: FAIL
-
   [Fetching about:blank (GET) is OK]
     expected: FAIL
 
@@ -12,12 +9,3 @@
   [Fetching about:blank (POST) is OK]
     expected: FAIL
 
-  [Fetching about:invalid.com is KO]
-    expected: FAIL
-
-  [Fetching about:config is KO]
-    expected: FAIL
-
-  [Fetching about:unicorn is KO]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-about.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-about.html.ini
index 2cb86644551..35acf3f4bd7 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-about.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-about.html.ini
@@ -1,8 +1,5 @@
 [scheme-about.html]
   type: testharness
-  [Fetching about:blank is OK]
-    expected: FAIL
-
   [Fetching about:blank (GET) is OK]
     expected: FAIL
 
@@ -12,12 +9,3 @@
   [Fetching about:blank (POST) is OK]
     expected: FAIL
 
-  [Fetching about:invalid.com is KO]
-    expected: FAIL
-
-  [Fetching about:config is KO]
-    expected: FAIL
-
-  [Fetching about:unicorn is KO]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-blob-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-blob-worker.html.ini
index 9feeea38b56..74240439891 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-blob-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-blob-worker.html.ini
@@ -1,26 +1,3 @@
 [scheme-blob-worker.html]
   type: testharness
-  [Fetching [GET\] URL.createObjectURL(blob) is OK]
-    expected: FAIL
-
-  [Fetching [GET\] blob:http://www.web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching [POST\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [OPTIONS\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [HEAD\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [PUT\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [DELETE\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [INVALID\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
+  expected: CRASH
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-blob.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-blob.html.ini
index 6463fa3f870..ef3371f4e38 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-blob.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-blob.html.ini
@@ -1,26 +1,3 @@
 [scheme-blob.html]
   type: testharness
-  [Fetching [GET\] URL.createObjectURL(blob) is OK]
-    expected: FAIL
-
-  [Fetching [GET\] blob:http://www.web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching [POST\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [OPTIONS\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [HEAD\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [PUT\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [DELETE\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
-  [Fetching [INVALID\] URL.createObjectURL(blob) is KO]
-    expected: FAIL
-
+  expected: CRASH
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-data-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-data-worker.html.ini
index 48350b7912e..07bdf4caaaa 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-data-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-data-worker.html.ini
@@ -15,12 +15,3 @@
   [Fetching data:image/png;base64,cmVzcG9uc2UncyBib2[...\] is OK]
     expected: FAIL
 
-  [Fetching [GET\] data:notAdataUrl.com is KO]
-    expected: FAIL
-
-  [Fetching [POST\] data:,response%27s%20body is KO]
-    expected: FAIL
-
-  [Fetching [HEAD\] data:,response%27s%20body is KO]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-data.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-data.html.ini
index 3cde02a71c6..2e78bab0e48 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-data.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-data.html.ini
@@ -15,12 +15,3 @@
   [Fetching data:image/png;base64,cmVzcG9uc2UncyBib2[...\] is OK]
     expected: FAIL
 
-  [Fetching [GET\] data:notAdataUrl.com is KO]
-    expected: FAIL
-
-  [Fetching [POST\] data:,response%27s%20body is KO]
-    expected: FAIL
-
-  [Fetching [HEAD\] data:,response%27s%20body is KO]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-others-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-others-worker.html.ini
deleted file mode 100644
index 6f6728ae993..00000000000
--- a/tests/wpt/metadata/fetch/api/basic/scheme-others-worker.html.ini
+++ /dev/null
@@ -1,50 +0,0 @@
-[scheme-others-worker.html]
-  type: testharness
-  [Fetching aaa://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching cap://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching cid://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching dav://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching dict://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching dns://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching geo://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching im://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching imap://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching ipp://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching ldap://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching mailto://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching nfs://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching pop://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching rtsp://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching snmp://web-platform.test:8000/ is KO]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-others.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-others.html.ini
deleted file mode 100644
index f38e7a475a4..00000000000
--- a/tests/wpt/metadata/fetch/api/basic/scheme-others.html.ini
+++ /dev/null
@@ -1,50 +0,0 @@
-[scheme-others.html]
-  type: testharness
-  [Fetching aaa://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching cap://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching cid://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching dav://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching dict://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching dns://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching geo://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching im://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching imap://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching ipp://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching ldap://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching mailto://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching nfs://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching pop://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching rtsp://web-platform.test:8000/ is KO]
-    expected: FAIL
-
-  [Fetching snmp://web-platform.test:8000/ is KO]
-    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 181b87530a3..85f5ab41ac1 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
@@ -12,9 +12,6 @@
   [Same domain different protocol different port [no-cors mode\]]
     expected: FAIL
 
-  [Same domain different protocol different port [server forbid CORS\]]
-    expected: FAIL
-
   [Same domain different protocol different port [cors mode\]]
     expected: FAIL
 
@@ -39,9 +36,6 @@
   [Cross domain different protocol [no-cors mode\]]
     expected: FAIL
 
-  [Cross domain different protocol [server forbid CORS\]]
-    expected: FAIL
-
   [Cross domain different protocol [cors mode\]]
     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 3efe54ec934..0b042261e06 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini
@@ -12,9 +12,6 @@
   [Same domain different protocol different port [no-cors mode\]]
     expected: FAIL
 
-  [Same domain different protocol different port [server forbid CORS\]]
-    expected: FAIL
-
   [Same domain different protocol different port [cors mode\]]
     expected: FAIL
 
@@ -39,9 +36,6 @@
   [Cross domain different protocol [no-cors mode\]]
     expected: FAIL
 
-  [Cross domain different protocol [server forbid CORS\]]
-    expected: FAIL
-
   [Cross domain different protocol [cors mode\]]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-cookies-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-cookies-worker.html.ini
index 2dd966d0297..2d07c6ff52f 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-cookies-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-cookies-worker.html.ini
@@ -1,20 +1,5 @@
 [cors-cookies-worker.html]
   type: testharness
-  [Omit mode: no cookie sent]
-    expected: FAIL
-
   [Include mode: 1 cookie]
     expected: FAIL
 
-  [Include mode: local cookies are not sent with remote request]
-    expected: FAIL
-
-  [Include mode: remote cookies are not sent with local request]
-    expected: FAIL
-
-  [Same-origin mode: cookies are discarded in cors request]
-    expected: FAIL
-
-  [Include mode: remote cookies are not sent with other remote request]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-cookies.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-cookies.html.ini
index f75dcfcf7e8..4503f6dde8a 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-cookies.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-cookies.html.ini
@@ -1,20 +1,5 @@
 [cors-cookies.html]
   type: testharness
-  [Omit mode: no cookie sent]
-    expected: FAIL
-
   [Include mode: 1 cookie]
     expected: FAIL
 
-  [Include mode: local cookies are not sent with remote request]
-    expected: FAIL
-
-  [Include mode: remote cookies are not sent with local request]
-    expected: FAIL
-
-  [Same-origin mode: cookies are discarded in cors request]
-    expected: FAIL
-
-  [Include mode: remote cookies are not sent with other remote request]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini
index b7434968587..3951d50959f 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini
@@ -1,20 +1,5 @@
 [cors-multiple-origins-worker.html]
   type: testharness
-  [3 origins allowed, match the 3rd (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match the 3rd ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*" and http://web-platform.test:8000)]
-    expected: FAIL
-
   [3 origins allowed, no match]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini
index 9e5ff2ffc20..212e826ae7a 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini
@@ -1,20 +1,5 @@
 [cors-multiple-origins.html]
   type: testharness
-  [3 origins allowed, match the 3rd (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match the 3rd ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*" and http://web-platform.test:8000)]
-    expected: FAIL
-
   [3 origins allowed, no match]
     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
index c95749f5c24..1f9dd1a8bdb 100644
--- 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
@@ -1,47 +1,8 @@
 [cors-no-preflight-worker.html]
   type: testharness
-  [Cross domain basic usage [GET\]]
-    expected: FAIL
-
-  [Same domain different port [GET\]]
-    expected: FAIL
-
-  [Cross domain different port [GET\]]
-    expected: FAIL
-
   [Cross domain different protocol [GET\]]
     expected: FAIL
 
   [Same domain different protocol different port [GET\]]
     expected: FAIL
 
-  [Cross domain [POST\]]
-    expected: FAIL
-
-  [Cross domain [HEAD\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Accept: */*\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Accept-Language: fr\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Language: fr\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: application/x-www-form-urlencoded\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: multipart/form-data\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: text/plain\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: text/plain;charset=utf-8\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: Text/Plain;charset=utf-8\]]
-    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
index 71a9d1c5f1d..5c35af97915 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini
@@ -1,47 +1,8 @@
 [cors-no-preflight.html]
   type: testharness
-  [Cross domain basic usage [GET\]]
-    expected: FAIL
-
-  [Same domain different port [GET\]]
-    expected: FAIL
-
-  [Cross domain different port [GET\]]
-    expected: FAIL
-
   [Cross domain different protocol [GET\]]
     expected: FAIL
 
   [Same domain different protocol different port [GET\]]
     expected: FAIL
 
-  [Cross domain [POST\]]
-    expected: FAIL
-
-  [Cross domain [HEAD\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Accept: */*\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Accept-Language: fr\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Language: fr\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: application/x-www-form-urlencoded\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: multipart/form-data\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: text/plain\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: text/plain;charset=utf-8\]]
-    expected: FAIL
-
-  [Cross domain [GET\] [Content-Type: Text/Plain;charset=utf-8\]]
-    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 413b3f652bc..b2891aad31a 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
@@ -1,50 +1,26 @@
 [cors-origin-worker.html]
   type: testharness
-  [Cross domain different subdomain [origin OK\]]
-    expected: FAIL
-
   [Cross domain different subdomain [origin KO\]]
     expected: FAIL
 
-  [Same domain different port [origin OK\]]
-    expected: FAIL
-
   [Same domain different port [origin KO\]]
     expected: FAIL
 
-  [Cross domain different port [origin OK\]]
-    expected: FAIL
-
   [Cross domain different port [origin KO\]]
     expected: FAIL
 
   [Cross domain different protocol [origin OK\]]
     expected: FAIL
 
-  [Cross domain different protocol [origin KO\]]
-    expected: FAIL
-
   [Same domain different protocol different port [origin OK\]]
     expected: FAIL
 
-  [Same domain different protocol different port [origin KO\]]
-    expected: FAIL
-
-  [Cross domain [POST\] [origin OK\]]
-    expected: FAIL
-
   [Cross domain [POST\] [origin KO\]]
     expected: FAIL
 
-  [Cross domain [HEAD\] [origin OK\]]
-    expected: FAIL
-
   [Cross domain [HEAD\] [origin KO\]]
     expected: FAIL
 
-  [CORS preflight [PUT\] [origin OK\]]
-    expected: FAIL
-
   [CORS preflight [PUT\] [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 9738395f8ea..19ca6c11344 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini
@@ -1,50 +1,26 @@
 [cors-origin.html]
   type: testharness
-  [Cross domain different subdomain [origin OK\]]
-    expected: FAIL
-
   [Cross domain different subdomain [origin KO\]]
     expected: FAIL
 
-  [Same domain different port [origin OK\]]
-    expected: FAIL
-
   [Same domain different port [origin KO\]]
     expected: FAIL
 
-  [Cross domain different port [origin OK\]]
-    expected: FAIL
-
   [Cross domain different port [origin KO\]]
     expected: FAIL
 
   [Cross domain different protocol [origin OK\]]
     expected: FAIL
 
-  [Cross domain different protocol [origin KO\]]
-    expected: FAIL
-
   [Same domain different protocol different port [origin OK\]]
     expected: FAIL
 
-  [Same domain different protocol different port [origin KO\]]
-    expected: FAIL
-
-  [Cross domain [POST\] [origin OK\]]
-    expected: FAIL
-
   [Cross domain [POST\] [origin KO\]]
     expected: FAIL
 
-  [Cross domain [HEAD\] [origin OK\]]
-    expected: FAIL
-
   [Cross domain [HEAD\] [origin KO\]]
     expected: FAIL
 
-  [CORS preflight [PUT\] [origin OK\]]
-    expected: FAIL
-
   [CORS preflight [PUT\] [origin KO\]]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect-worker.html.ini
deleted file mode 100644
index a067c067a2a..00000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect-worker.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[cors-preflight-redirect-worker.html]
-  type: testharness
-  [Redirection 301 on preflight failed]
-    expected: FAIL
-
-  [Redirection 301 after preflight failed]
-    expected: FAIL
-
-  [Redirection 302 on preflight failed]
-    expected: FAIL
-
-  [Redirection 302 after preflight failed]
-    expected: FAIL
-
-  [Redirection 303 on preflight failed]
-    expected: FAIL
-
-  [Redirection 303 after preflight failed]
-    expected: FAIL
-
-  [Redirection 307 on preflight failed]
-    expected: FAIL
-
-  [Redirection 307 after preflight failed]
-    expected: FAIL
-
-  [Redirection 308 on preflight failed]
-    expected: FAIL
-
-  [Redirection 308 after preflight failed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect.html.ini
deleted file mode 100644
index e5b48918e8e..00000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[cors-preflight-redirect.html]
-  type: testharness
-  [Redirection 301 on preflight failed]
-    expected: FAIL
-
-  [Redirection 301 after preflight failed]
-    expected: FAIL
-
-  [Redirection 302 on preflight failed]
-    expected: FAIL
-
-  [Redirection 302 after preflight failed]
-    expected: FAIL
-
-  [Redirection 303 on preflight failed]
-    expected: FAIL
-
-  [Redirection 303 after preflight failed]
-    expected: FAIL
-
-  [Redirection 307 on preflight failed]
-    expected: FAIL
-
-  [Redirection 307 after preflight failed]
-    expected: FAIL
-
-  [Redirection 308 on preflight failed]
-    expected: FAIL
-
-  [Redirection 308 after preflight failed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-status-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-status-worker.html.ini
deleted file mode 100644
index 9f9d2eab795..00000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-status-worker.html.ini
+++ /dev/null
@@ -1,83 +0,0 @@
-[cors-preflight-status-worker.html]
-  type: testharness
-  [Preflight answered with status 200]
-    expected: FAIL
-
-  [Preflight answered with status 201]
-    expected: FAIL
-
-  [Preflight answered with status 202]
-    expected: FAIL
-
-  [Preflight answered with status 203]
-    expected: FAIL
-
-  [Preflight answered with status 204]
-    expected: FAIL
-
-  [Preflight answered with status 205]
-    expected: FAIL
-
-  [Preflight answered with status 206]
-    expected: FAIL
-
-  [Preflight answered with status 300]
-    expected: FAIL
-
-  [Preflight answered with status 301]
-    expected: FAIL
-
-  [Preflight answered with status 302]
-    expected: FAIL
-
-  [Preflight answered with status 303]
-    expected: FAIL
-
-  [Preflight answered with status 304]
-    expected: FAIL
-
-  [Preflight answered with status 305]
-    expected: FAIL
-
-  [Preflight answered with status 306]
-    expected: FAIL
-
-  [Preflight answered with status 307]
-    expected: FAIL
-
-  [Preflight answered with status 308]
-    expected: FAIL
-
-  [Preflight answered with status 400]
-    expected: FAIL
-
-  [Preflight answered with status 401]
-    expected: FAIL
-
-  [Preflight answered with status 402]
-    expected: FAIL
-
-  [Preflight answered with status 403]
-    expected: FAIL
-
-  [Preflight answered with status 404]
-    expected: FAIL
-
-  [Preflight answered with status 405]
-    expected: FAIL
-
-  [Preflight answered with status 501]
-    expected: FAIL
-
-  [Preflight answered with status 502]
-    expected: FAIL
-
-  [Preflight answered with status 503]
-    expected: FAIL
-
-  [Preflight answered with status 504]
-    expected: FAIL
-
-  [Preflight answered with status 505]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-status.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-status.html.ini
deleted file mode 100644
index 12bb9ecf2e1..00000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-status.html.ini
+++ /dev/null
@@ -1,83 +0,0 @@
-[cors-preflight-status.html]
-  type: testharness
-  [Preflight answered with status 200]
-    expected: FAIL
-
-  [Preflight answered with status 201]
-    expected: FAIL
-
-  [Preflight answered with status 202]
-    expected: FAIL
-
-  [Preflight answered with status 203]
-    expected: FAIL
-
-  [Preflight answered with status 204]
-    expected: FAIL
-
-  [Preflight answered with status 205]
-    expected: FAIL
-
-  [Preflight answered with status 206]
-    expected: FAIL
-
-  [Preflight answered with status 300]
-    expected: FAIL
-
-  [Preflight answered with status 301]
-    expected: FAIL
-
-  [Preflight answered with status 302]
-    expected: FAIL
-
-  [Preflight answered with status 303]
-    expected: FAIL
-
-  [Preflight answered with status 304]
-    expected: FAIL
-
-  [Preflight answered with status 305]
-    expected: FAIL
-
-  [Preflight answered with status 306]
-    expected: FAIL
-
-  [Preflight answered with status 307]
-    expected: FAIL
-
-  [Preflight answered with status 308]
-    expected: FAIL
-
-  [Preflight answered with status 400]
-    expected: FAIL
-
-  [Preflight answered with status 401]
-    expected: FAIL
-
-  [Preflight answered with status 402]
-    expected: FAIL
-
-  [Preflight answered with status 403]
-    expected: FAIL
-
-  [Preflight answered with status 404]
-    expected: FAIL
-
-  [Preflight answered with status 405]
-    expected: FAIL
-
-  [Preflight answered with status 501]
-    expected: FAIL
-
-  [Preflight answered with status 502]
-    expected: FAIL
-
-  [Preflight answered with status 503]
-    expected: FAIL
-
-  [Preflight answered with status 504]
-    expected: FAIL
-
-  [Preflight answered with status 505]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-worker.html.ini
index 1c4ec4cc7cc..26b18d15cbb 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-worker.html.ini
@@ -15,15 +15,9 @@
   [CORS [PATCH\], server allows]
     expected: FAIL
 
-  [CORS [PATCH\], server refuses]
-    expected: FAIL
-
   [CORS [NEW\], server allows]
     expected: FAIL
 
-  [CORS [NEW\], server refuses]
-    expected: FAIL
-
   [CORS [GET\] [x-test-header: allowed\], server allows]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight.html.ini
index 28789b10484..742b75e2f71 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight.html.ini
@@ -15,15 +15,9 @@
   [CORS [PATCH\], server allows]
     expected: FAIL
 
-  [CORS [PATCH\], server refuses]
-    expected: FAIL
-
   [CORS [NEW\], server allows]
     expected: FAIL
 
-  [CORS [NEW\], server refuses]
-    expected: FAIL
-
   [CORS [GET\] [x-test-header: allowed\], server allows]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials-worker.html.ini
index 66040a9d4ba..b58871ea05e 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials-worker.html.ini
@@ -1,23 +1,5 @@
 [cors-redirect-credentials-worker.html]
   type: testharness
-  [Redirect 301 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 301 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 301 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 301 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 301 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 301 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 301 from remote to same remote with user and password]
     expected: FAIL
 
@@ -27,33 +9,6 @@
   [Redirect 301 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 301 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 301 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 301 from remote to another remote with password]
-    expected: FAIL
-
-  [Redirect 302 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 302 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 302 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 302 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 302 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 302 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 302 from remote to same remote with user and password]
     expected: FAIL
 
@@ -63,33 +18,6 @@
   [Redirect 302 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 302 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 302 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 302 from remote to another remote with password]
-    expected: FAIL
-
-  [Redirect 303 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 303 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 303 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 303 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 303 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 303 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 303 from remote to same remote with user and password]
     expected: FAIL
 
@@ -99,33 +27,6 @@
   [Redirect 303 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 303 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 303 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 303 from remote to another remote with password]
-    expected: FAIL
-
-  [Redirect 307 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 307 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 307 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 307 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 307 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 307 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 307 from remote to same remote with user and password]
     expected: FAIL
 
@@ -135,33 +36,6 @@
   [Redirect 307 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 307 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 307 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 307 from remote to another remote with password]
-    expected: FAIL
-
-  [Redirect 308 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 308 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 308 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 308 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 308 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 308 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 308 from remote to same remote with user and password]
     expected: FAIL
 
@@ -171,12 +45,3 @@
   [Redirect 308 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 308 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 308 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 308 from remote to another remote with password]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials.html.ini
index 8055315bb9c..a21b1c4217e 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials.html.ini
@@ -1,23 +1,5 @@
 [cors-redirect-credentials.html]
   type: testharness
-  [Redirect 301 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 301 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 301 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 301 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 301 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 301 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 301 from remote to same remote with user and password]
     expected: FAIL
 
@@ -27,33 +9,6 @@
   [Redirect 301 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 301 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 301 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 301 from remote to another remote with password]
-    expected: FAIL
-
-  [Redirect 302 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 302 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 302 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 302 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 302 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 302 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 302 from remote to same remote with user and password]
     expected: FAIL
 
@@ -63,33 +18,6 @@
   [Redirect 302 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 302 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 302 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 302 from remote to another remote with password]
-    expected: FAIL
-
-  [Redirect 303 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 303 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 303 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 303 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 303 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 303 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 303 from remote to same remote with user and password]
     expected: FAIL
 
@@ -99,33 +27,6 @@
   [Redirect 303 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 303 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 303 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 303 from remote to another remote with password]
-    expected: FAIL
-
-  [Redirect 307 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 307 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 307 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 307 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 307 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 307 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 307 from remote to same remote with user and password]
     expected: FAIL
 
@@ -135,33 +36,6 @@
   [Redirect 307 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 307 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 307 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 307 from remote to another remote with password]
-    expected: FAIL
-
-  [Redirect 308 from same origin to remote with user and password]
-    expected: FAIL
-
-  [Redirect 308 from same origin to remote with user]
-    expected: FAIL
-
-  [Redirect 308 from same origin to remote with password]
-    expected: FAIL
-
-  [Redirect 308 from remote to same origin with user and password]
-    expected: FAIL
-
-  [Redirect 308 from remote to same origin with user]
-    expected: FAIL
-
-  [Redirect 308 from remote to same origin with password]
-    expected: FAIL
-
   [Redirect 308 from remote to same remote with user and password]
     expected: FAIL
 
@@ -171,12 +45,3 @@
   [Redirect 308 from remote to same remote with password]
     expected: FAIL
 
-  [Redirect 308 from remote to another remote with user and password]
-    expected: FAIL
-
-  [Redirect 308 from remote to another remote with user]
-    expected: FAIL
-
-  [Redirect 308 from remote to another remote with password]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini
deleted file mode 100644
index c999091d884..00000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini
+++ /dev/null
@@ -1,62 +0,0 @@
-[cors-redirect-worker.html]
-  type: testharness
-  [Redirect 301: cors to same cors]
-    expected: FAIL
-
-  [Redirect 301: cors to another cors]
-    expected: FAIL
-
-  [Redirect 301: same origin to cors]
-    expected: FAIL
-
-  [Redirect 301: cors to same origin]
-    expected: FAIL
-
-  [Redirect 302: cors to same cors]
-    expected: FAIL
-
-  [Redirect 302: cors to another cors]
-    expected: FAIL
-
-  [Redirect 302: same origin to cors]
-    expected: FAIL
-
-  [Redirect 302: cors to same origin]
-    expected: FAIL
-
-  [Redirect 303: cors to same cors]
-    expected: FAIL
-
-  [Redirect 303: cors to another cors]
-    expected: FAIL
-
-  [Redirect 303: same origin to cors]
-    expected: FAIL
-
-  [Redirect 303: cors to same origin]
-    expected: FAIL
-
-  [Redirect 307: cors to same cors]
-    expected: FAIL
-
-  [Redirect 307: cors to another cors]
-    expected: FAIL
-
-  [Redirect 307: same origin to cors]
-    expected: FAIL
-
-  [Redirect 307: cors to same origin]
-    expected: FAIL
-
-  [Redirect 308: cors to same cors]
-    expected: FAIL
-
-  [Redirect 308: cors to another cors]
-    expected: FAIL
-
-  [Redirect 308: same origin to cors]
-    expected: FAIL
-
-  [Redirect 308: cors to same origin]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini
deleted file mode 100644
index 8ce76e0ea45..00000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini
+++ /dev/null
@@ -1,62 +0,0 @@
-[cors-redirect.html]
-  type: testharness
-  [Redirect 301: cors to same cors]
-    expected: FAIL
-
-  [Redirect 301: cors to another cors]
-    expected: FAIL
-
-  [Redirect 301: same origin to cors]
-    expected: FAIL
-
-  [Redirect 301: cors to same origin]
-    expected: FAIL
-
-  [Redirect 302: cors to same cors]
-    expected: FAIL
-
-  [Redirect 302: cors to another cors]
-    expected: FAIL
-
-  [Redirect 302: same origin to cors]
-    expected: FAIL
-
-  [Redirect 302: cors to same origin]
-    expected: FAIL
-
-  [Redirect 303: cors to same cors]
-    expected: FAIL
-
-  [Redirect 303: cors to another cors]
-    expected: FAIL
-
-  [Redirect 303: same origin to cors]
-    expected: FAIL
-
-  [Redirect 303: cors to same origin]
-    expected: FAIL
-
-  [Redirect 307: cors to same cors]
-    expected: FAIL
-
-  [Redirect 307: cors to another cors]
-    expected: FAIL
-
-  [Redirect 307: same origin to cors]
-    expected: FAIL
-
-  [Redirect 307: cors to same origin]
-    expected: FAIL
-
-  [Redirect 308: cors to same cors]
-    expected: FAIL
-
-  [Redirect 308: cors to another cors]
-    expected: FAIL
-
-  [Redirect 308: same origin to cors]
-    expected: FAIL
-
-  [Redirect 308: cors to same origin]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-origin-worker.html.ini
index c73b106ce69..29cdeff6c71 100644
--- a/tests/wpt/metadata/fetch/api/policies/referrer-origin-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-origin-worker.html.ini
@@ -3,6 +3,3 @@
   [Request's referrer is origin]
     expected: FAIL
 
-  [Throw a TypeError referrer is not same-origin with origin]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-origin.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-origin.html.ini
index 60ced001107..141af27077e 100644
--- a/tests/wpt/metadata/fetch/api/policies/referrer-origin.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-origin.html.ini
@@ -3,6 +3,3 @@
   [Request's referrer is origin]
     expected: FAIL
 
-  [Throw a TypeError referrer is not same-origin with origin]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
deleted file mode 100644
index 1c7eef97d5d..00000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[redirect-count-worker.html]
-  type: testharness
-  [Redirect 301 20 times]
-    expected: FAIL
-
-  [Redirect 301 21 times]
-    expected: FAIL
-
-  [Redirect 302 20 times]
-    expected: FAIL
-
-  [Redirect 302 21 times]
-    expected: FAIL
-
-  [Redirect 303 20 times]
-    expected: FAIL
-
-  [Redirect 303 21 times]
-    expected: FAIL
-
-  [Redirect 307 20 times]
-    expected: FAIL
-
-  [Redirect 307 21 times]
-    expected: FAIL
-
-  [Redirect 308 20 times]
-    expected: FAIL
-
-  [Redirect 308 21 times]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
deleted file mode 100644
index 104547d5eb7..00000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[redirect-count.html]
-  type: testharness
-  [Redirect 301 20 times]
-    expected: FAIL
-
-  [Redirect 301 21 times]
-    expected: FAIL
-
-  [Redirect 302 20 times]
-    expected: FAIL
-
-  [Redirect 302 21 times]
-    expected: FAIL
-
-  [Redirect 303 20 times]
-    expected: FAIL
-
-  [Redirect 303 21 times]
-    expected: FAIL
-
-  [Redirect 307 20 times]
-    expected: FAIL
-
-  [Redirect 307 21 times]
-    expected: FAIL
-
-  [Redirect 308 20 times]
-    expected: FAIL
-
-  [Redirect 308 21 times]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini
index d101a8e4958..c5ad5926032 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini
@@ -1,92 +1,51 @@
 [redirect-location-worker.html]
   type: testharness
-  [Redirect 301 in "follow" mode without location]
-    expected: FAIL
-
-  [Redirect 301 in "manual" mode without location]
-    expected: FAIL
-
-  [Redirect 301 in "follow" mode with invalid location]
-    expected: FAIL
-
+  expected: TIMEOUT
   [Redirect 301 in "manual" mode with invalid location]
     expected: FAIL
 
-  [Redirect 301 in "follow" mode with data location]
-    expected: FAIL
-
   [Redirect 301 in "manual" mode with data location]
     expected: FAIL
 
-  [Redirect 302 in "follow" mode without location]
-    expected: FAIL
-
-  [Redirect 302 in "manual" mode without location]
-    expected: FAIL
-
-  [Redirect 302 in "follow" mode with invalid location]
-    expected: FAIL
-
   [Redirect 302 in "manual" mode with invalid location]
     expected: FAIL
 
-  [Redirect 302 in "follow" mode with data location]
-    expected: FAIL
-
   [Redirect 302 in "manual" mode with data location]
     expected: FAIL
 
-  [Redirect 303 in "follow" mode without location]
-    expected: FAIL
-
-  [Redirect 303 in "manual" mode without location]
-    expected: FAIL
-
-  [Redirect 303 in "follow" mode with invalid location]
-    expected: FAIL
-
   [Redirect 303 in "manual" mode with invalid location]
     expected: FAIL
 
-  [Redirect 303 in "follow" mode with data location]
-    expected: FAIL
-
   [Redirect 303 in "manual" mode with data location]
     expected: FAIL
 
-  [Redirect 307 in "follow" mode without location]
-    expected: FAIL
-
-  [Redirect 307 in "manual" mode without location]
-    expected: FAIL
-
   [Redirect 307 in "follow" mode with invalid location]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Redirect 307 in "manual" mode with invalid location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 307 in "follow" mode with data location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 307 in "manual" mode with data location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "follow" mode without location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "manual" mode without location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "follow" mode with invalid location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "manual" mode with invalid location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "follow" mode with data location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "manual" mode with data location]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini
index cf32d72ffe3..c77ddc25ce7 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini
@@ -1,92 +1,51 @@
 [redirect-location.html]
   type: testharness
-  [Redirect 301 in "follow" mode without location]
-    expected: FAIL
-
-  [Redirect 301 in "manual" mode without location]
-    expected: FAIL
-
-  [Redirect 301 in "follow" mode with invalid location]
-    expected: FAIL
-
+  expected: TIMEOUT
   [Redirect 301 in "manual" mode with invalid location]
     expected: FAIL
 
-  [Redirect 301 in "follow" mode with data location]
-    expected: FAIL
-
   [Redirect 301 in "manual" mode with data location]
     expected: FAIL
 
-  [Redirect 302 in "follow" mode without location]
-    expected: FAIL
-
-  [Redirect 302 in "manual" mode without location]
-    expected: FAIL
-
-  [Redirect 302 in "follow" mode with invalid location]
-    expected: FAIL
-
   [Redirect 302 in "manual" mode with invalid location]
     expected: FAIL
 
-  [Redirect 302 in "follow" mode with data location]
-    expected: FAIL
-
   [Redirect 302 in "manual" mode with data location]
     expected: FAIL
 
-  [Redirect 303 in "follow" mode without location]
-    expected: FAIL
-
-  [Redirect 303 in "manual" mode without location]
-    expected: FAIL
-
-  [Redirect 303 in "follow" mode with invalid location]
-    expected: FAIL
-
   [Redirect 303 in "manual" mode with invalid location]
     expected: FAIL
 
-  [Redirect 303 in "follow" mode with data location]
-    expected: FAIL
-
   [Redirect 303 in "manual" mode with data location]
     expected: FAIL
 
-  [Redirect 307 in "follow" mode without location]
-    expected: FAIL
-
-  [Redirect 307 in "manual" mode without location]
-    expected: FAIL
-
   [Redirect 307 in "follow" mode with invalid location]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Redirect 307 in "manual" mode with invalid location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 307 in "follow" mode with data location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 307 in "manual" mode with data location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "follow" mode without location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "manual" mode without location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "follow" mode with invalid location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "manual" mode with invalid location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "follow" mode with data location]
-    expected: FAIL
+    expected: NOTRUN
 
   [Redirect 308 in "manual" mode with data location]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini
index 9297aa46ce1..672f5a8635a 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini
@@ -1,8 +1,5 @@
 [redirect-method-worker.html]
   type: testharness
-  [Response.redirected should be false on not-redirected responses]
-    expected: FAIL
-
   [Redirect 301 with GET]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini
index 8c65c9383e2..de315047f46 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini
@@ -1,8 +1,5 @@
 [redirect-method.html]
   type: testharness
-  [Response.redirected should be false on not-redirected responses]
-    expected: FAIL
-
   [Redirect 301 with GET]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini
index 3c11d6721ef..3b1d82612e7 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini
@@ -3,45 +3,30 @@
   [Redirect 301 in "error" mode ]
     expected: FAIL
 
-  [Redirect 301 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 301 in "manual" mode ]
     expected: FAIL
 
   [Redirect 302 in "error" mode ]
     expected: FAIL
 
-  [Redirect 302 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 302 in "manual" mode ]
     expected: FAIL
 
   [Redirect 303 in "error" mode ]
     expected: FAIL
 
-  [Redirect 303 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 303 in "manual" mode ]
     expected: FAIL
 
   [Redirect 307 in "error" mode ]
     expected: FAIL
 
-  [Redirect 307 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 307 in "manual" mode ]
     expected: FAIL
 
   [Redirect 308 in "error" mode ]
     expected: FAIL
 
-  [Redirect 308 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 308 in "manual" mode ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini
index 6cd7f1d4bd4..8c1254256d1 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini
@@ -3,45 +3,30 @@
   [Redirect 301 in "error" mode ]
     expected: FAIL
 
-  [Redirect 301 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 301 in "manual" mode ]
     expected: FAIL
 
   [Redirect 302 in "error" mode ]
     expected: FAIL
 
-  [Redirect 302 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 302 in "manual" mode ]
     expected: FAIL
 
   [Redirect 303 in "error" mode ]
     expected: FAIL
 
-  [Redirect 303 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 303 in "manual" mode ]
     expected: FAIL
 
   [Redirect 307 in "error" mode ]
     expected: FAIL
 
-  [Redirect 307 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 307 in "manual" mode ]
     expected: FAIL
 
   [Redirect 308 in "error" mode ]
     expected: FAIL
 
-  [Redirect 308 in "follow" mode ]
-    expected: FAIL
-
   [Redirect 308 in "manual" mode ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini
index e844e2e51f7..4dbf5882893 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini
@@ -1,8 +1,5 @@
 [redirect-origin-worker.html]
   type: testharness
-  [Same origin to same origin redirection 301]
-    expected: FAIL
-
   [Same origin to other origin redirection 301]
     expected: FAIL
 
@@ -12,9 +9,6 @@
   [Other origin to same origin redirection 301]
     expected: FAIL
 
-  [Same origin to same origin redirection 302]
-    expected: FAIL
-
   [Same origin to other origin redirection 302]
     expected: FAIL
 
@@ -24,9 +18,6 @@
   [Other origin to same origin redirection 302]
     expected: FAIL
 
-  [Same origin to same origin redirection 303]
-    expected: FAIL
-
   [Same origin to other origin redirection 303]
     expected: FAIL
 
@@ -36,9 +27,6 @@
   [Other origin to same origin redirection 303]
     expected: FAIL
 
-  [Same origin to same origin redirection 307]
-    expected: FAIL
-
   [Same origin to other origin redirection 307]
     expected: FAIL
 
@@ -48,9 +36,6 @@
   [Other origin to same origin redirection 307]
     expected: FAIL
 
-  [Same origin to same origin redirection 308]
-    expected: FAIL
-
   [Same origin to other origin redirection 308]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini
index 89f4d211ba9..f9d4621134c 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini
@@ -1,8 +1,5 @@
 [redirect-origin.html]
   type: testharness
-  [Same origin to same origin redirection 301]
-    expected: FAIL
-
   [Same origin to other origin redirection 301]
     expected: FAIL
 
@@ -12,9 +9,6 @@
   [Other origin to same origin redirection 301]
     expected: FAIL
 
-  [Same origin to same origin redirection 302]
-    expected: FAIL
-
   [Same origin to other origin redirection 302]
     expected: FAIL
 
@@ -24,9 +18,6 @@
   [Other origin to same origin redirection 302]
     expected: FAIL
 
-  [Same origin to same origin redirection 303]
-    expected: FAIL
-
   [Same origin to other origin redirection 303]
     expected: FAIL
 
@@ -36,9 +27,6 @@
   [Other origin to same origin redirection 303]
     expected: FAIL
 
-  [Same origin to same origin redirection 307]
-    expected: FAIL
-
   [Same origin to other origin redirection 307]
     expected: FAIL
 
@@ -48,9 +36,6 @@
   [Other origin to same origin redirection 307]
     expected: FAIL
 
-  [Same origin to same origin redirection 308]
-    expected: FAIL
-
   [Same origin to other origin redirection 308]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini
index 491b4d0cce8..a386be931c2 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini
@@ -1,20 +1,5 @@
 [redirect-schemes.html]
   type: testharness
-  [Fetch: handling different schemes in redirects]
-    expected: FAIL
-
-  [Fetch: handling different schemes in redirects 1]
-    expected: FAIL
-
-  [Fetch: handling different schemes in redirects 2]
-    expected: FAIL
-
   [Fetch: handling different schemes in redirects 3]
     expected: FAIL
 
-  [Fetch: handling different schemes in redirects 4]
-    expected: FAIL
-
-  [Fetch: handling different schemes in redirects 5]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini
index a6c2bc1a560..031dc346574 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini
@@ -1,17 +1,8 @@
 [redirect-to-dataurl-worker.html]
   type: testharness
-  [Testing data URL loading after same-origin redirection (cors mode)]
-    expected: FAIL
-
   [Testing data URL loading after same-origin redirection (no-cors mode)]
     expected: FAIL
 
-  [Testing data URL loading after same-origin redirection (same-origin mode)]
-    expected: FAIL
-
-  [Testing data URL loading after cross-origin redirection (cors mode)]
-    expected: FAIL
-
   [Testing data URL loading after cross-origin redirection (no-cors mode)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini
index 430ee44275a..25a5bfab0a9 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini
@@ -1,17 +1,8 @@
 [redirect-to-dataurl.html]
   type: testharness
-  [Testing data URL loading after same-origin redirection (cors mode)]
-    expected: FAIL
-
   [Testing data URL loading after same-origin redirection (no-cors mode)]
     expected: FAIL
 
-  [Testing data URL loading after same-origin redirection (same-origin mode)]
-    expected: FAIL
-
-  [Testing data URL loading after cross-origin redirection (cors mode)]
-    expected: FAIL
-
   [Testing data URL loading after cross-origin redirection (no-cors mode)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/request/request-cache.html.ini b/tests/wpt/metadata/fetch/api/request/request-cache.html.ini
index d3f76be8abd..d80d4fe955a 100644
--- a/tests/wpt/metadata/fetch/api/request/request-cache.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-cache.html.ini
@@ -1,248 +1,4 @@
 [request-cache.html]
   type: testharness
-  [RequestCache "default" mode checks the cache for previously cached content and goes to the network for stale responses with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode checks the cache for previously cached content and goes to the network for stale responses with date and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode checks the cache for previously cached content and avoids going to the network if a fresh response exists with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode checks the cache for previously cached content and avoids going to the network if a fresh response exists with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "no-cache" mode revalidates stale responses found in the cache with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "no-cache" mode revalidates stale responses found in the cache with date and stale response]
-    expected: FAIL
-
-  [RequestCache "no-cache" mode revalidates fresh responses found in the cache with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "no-cache" mode revalidates fresh responses found in the cache with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for stale responses with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for stale responses with date and stale response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for fresh responses with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for fresh responses with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with date and stale response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with date and stale response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "force-cache" stores the response in the cache if it goes to the network with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "force-cache" stores the response in the cache if it goes to the network with date and stale response]
-    expected: FAIL
-
-  [RequestCache "force-cache" stores the response in the cache if it goes to the network with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "force-cache" stores the response in the cache if it goes to the network with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" mode checks the cache for previously cached content and avoids revalidation for stale responses with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" mode checks the cache for previously cached content and avoids revalidation for stale responses with date and stale response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" mode checks the cache for previously cached content and avoids revalidation for fresh responses with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" mode checks the cache for previously cached content and avoids revalidation for fresh responses with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" mode checks the cache for previously cached content and does not go to the network if a cached response is not found with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" mode checks the cache for previously cached content and does not go to the network if a cached response is not found with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" (with "same-origin") uses cached same-origin redirects to same-origin content with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" (with "same-origin") uses cached same-origin redirects to same-origin content with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" (with "same-origin") uses cached same-origin redirects to same-origin content with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" (with "same-origin") uses cached same-origin redirects to same-origin content with date and stale response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" (with "same-origin") does not follow redirects across origins and rejects with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" (with "same-origin") does not follow redirects across origins and rejects with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" (with "same-origin") does not follow redirects across origins and rejects with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "only-if-cached" (with "same-origin") does not follow redirects across origins and rejects with date and stale response]
-    expected: FAIL
-
-  [RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with date and stale response]
-    expected: FAIL
-
-  [RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "no-store" mode does not store the response in the cache with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "no-store" mode does not store the response in the cache with date and stale response]
-    expected: FAIL
-
-  [RequestCache "no-store" mode does not store the response in the cache with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "no-store" mode does not store the response in the cache with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and stale response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and fresh response]
-    expected: FAIL
-
-  [Responses with the "Cache-Control: no-store" header are not stored in the cache with Etag and stale response]
-    expected: FAIL
-
-  [Responses with the "Cache-Control: no-store" header are not stored in the cache with date and stale response]
-    expected: FAIL
-
-  [Responses with the "Cache-Control: no-store" header are not stored in the cache with Etag and fresh response]
-    expected: FAIL
-
-  [Responses with the "Cache-Control: no-store" header are not stored in the cache with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with date and stale response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does store the response in the cache with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does store the response in the cache with date and stale response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does store the response in the cache with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does store the response in the cache with date and fresh response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with Etag and stale response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with date and stale response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with Etag and fresh response]
-    expected: FAIL
-
-  [RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with date and fresh response]
-    expected: FAIL
-
+  disabled: https://github.com/servo/servo/issues/13458
+  expected: CRASH
diff --git a/tests/wpt/metadata/fetch/api/request/request-consume.html.ini b/tests/wpt/metadata/fetch/api/request/request-consume.html.ini
index e714de76f6d..c409d5b0189 100644
--- a/tests/wpt/metadata/fetch/api/request/request-consume.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-consume.html.ini
@@ -15,39 +15,6 @@
   [Trying to consume bad JSON text as JSON: 'undefined']
     expected: FAIL
 
-  [Trying to consume bad JSON text as JSON: '{']
-    expected: FAIL
-
-  [Trying to consume bad JSON text as JSON: 'a']
-    expected: FAIL
-
-  [Trying to consume bad JSON text as JSON: '[']
-    expected: FAIL
-
-  [Consume ArrayBuffer request's body as text]
-    expected: FAIL
-
-  [Consume ArrayBuffer request's body as blob]
-    expected: FAIL
-
-  [Consume ArrayBuffer request's body as arrayBuffer]
-    expected: FAIL
-
-  [Consume ArrayBuffer request's body as JSON]
-    expected: FAIL
-
-  [Consume Uint8Array request's body as text]
-    expected: FAIL
-
-  [Consume Uint8Array request's body as blob]
-    expected: FAIL
-
-  [Consume Uint8Array request's body as arrayBuffer]
-    expected: FAIL
-
-  [Consume Uint8Array request's body as JSON]
-    expected: FAIL
-
   [Consume Int8Array request's body as text]
     expected: FAIL
 
@@ -57,10 +24,7 @@
   [Consume Int8Array request's body as arrayBuffer]
     expected: FAIL
 
-  [Consume Int8Array request's body as JSON]
-    expected: FAIL
-
-  [Consume Float32Array request's body as text]
+  [Consume ArrayBuffer request's body as text]
     expected: FAIL
 
   [Consume Float32Array request's body as blob]
@@ -87,3 +51,45 @@
   [Consume FormData request's body as FormData]
     expected: FAIL
 
+  [Consume blob response's body as arrayBuffer]
+    expected: FAIL
+
+  [Trying to consume bad JSON text as JSON: 'undefined']
+    expected: FAIL
+
+  [Trying to consume bad JSON text as JSON: '{']
+    expected: FAIL
+
+  [Trying to consume bad JSON text as JSON: 'a']
+    expected: FAIL
+
+  [Consume ArrayBuffer request's body as blob]
+    expected: FAIL
+
+  [Consume ArrayBuffer request's body as arrayBuffer]
+    expected: FAIL
+
+  [Consume ArrayBuffer request's body as JSON]
+    expected: FAIL
+
+  [Consume Uint8Array request's body as text]
+    expected: FAIL
+
+  [Consume Uint8Array request's body as blob]
+    expected: FAIL
+
+  [Consume Uint8Array request's body as arrayBuffer]
+    expected: FAIL
+
+  [Consume Uint8Array request's body as JSON]
+    expected: FAIL
+
+  [Consume Int8Array request's body as JSON]
+    expected: FAIL
+
+  [Consume Float32Array request's body as text]
+    expected: FAIL
+
+  [Trying to consume bad JSON text as JSON: '[']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini b/tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini
index 21ed2f7d8cc..a3bc4c15285 100644
--- a/tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini
@@ -12,6 +12,9 @@
   [Read text response's body as readableStream]
     expected: FAIL
 
+  [Read array buffer response's body as readableStream]
+    expected: FAIL
+
   [Read form data response's body as readableStream]
     expected: FAIL
 
@@ -21,6 +24,3 @@
   [Getting a redirect Response stream]
     expected: FAIL
 
-  [Read array buffer response's body as readableStream]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini
index 61a2d4a90de..31c366a0035 100644
--- a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini
@@ -1,14 +1,5 @@
 [response-stream-disturbed-5.html]
   type: testharness
-  [Getting a body reader after consuming as blob]
-    expected: FAIL
-
-  [Getting a body reader after consuming as text]
-    expected: FAIL
-
-  [Getting a body reader after consuming as json]
-    expected: FAIL
-
   [Getting a body reader after consuming as arrayBuffer]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..2680adb4b67
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9750909f302
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..95185f237f9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..23230f046a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..f414f0c3ad5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..4b326bafaf2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..8d1261b4ede
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..569bd1486f4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..891a23ee5dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d5ccce6d65b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..302d79bff12
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..ad526b14991
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..17d5d4dfd83
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2d47d3135d1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..660a7074295
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..0d233e5647a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..0904b71760e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..09c9f773f82
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..8dbffba79a1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..8c647ba10d0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..db83caaad48
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..c18869f62ba
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..838688a6bca
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..42c403799cf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..bae17003e34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..02da26c9c35
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-origin.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..ade2dcda637
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..ccc77e50b62
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..64dec2cb883
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..b8740f17198
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..7aa3e96176d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-origin-insecure.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
new file mode 100644
index 00000000000..4e9b1312c1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-origin-insecure.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..988019c9a60
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..03981fa9a2c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c0626d3cd32
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..4e8c665bf45
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..94b93825ee1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..6cf245d2b7b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html.ini
new file mode 100644
index 00000000000..aaa1e7f6db0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..eccfce7214c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..662fd6c46b3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..0928d8875c6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..69c849bf5d8
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..eec31a92dfe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..fdc8c8e4d61
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..071d1254096
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..2f8b7f356d5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c75859037cf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..f0bcf209980
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..8af5a559a0e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..45d9817b973
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..35927dab5e8
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d3120f417b6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..69e84b879e1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..c0363510707
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..a93e89af5c9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..bfabfe379ca
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..135d7ef9e4b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..bebb94deaa4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..7adb828e3c7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..0d7f04b8333
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..c7ec0d7e161
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..82c6d0ba970
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..449b6ed3997
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..3342db31e30
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..7af604a5069
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-origin.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d738215d2b2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..178c2d89598
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..26509a70dcd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..9610d5eb559
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..7aa3e96176d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-origin-insecure.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
new file mode 100644
index 00000000000..4e9b1312c1e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-origin-insecure.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..e44bc8981ca
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..9becbc9caaf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..ff0b6b1ebc5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..947d673e6c1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-origin.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..91c1cae22a6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..8d7362a709e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 00000000000..9d0b06a34f2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..a8f02781547
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..4da6ea9765d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-origin-insecure.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
new file mode 100644
index 00000000000..fad1879dd8f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-origin-insecure.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..21614210557
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..24cb9a31fff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..cd90d866b60
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-insecure.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
new file mode 100644
index 00000000000..fba2add3e58
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-insecure.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..cc19a5f61ff
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-insecure.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..5a89a25fcd7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c128043e5bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..8884bc55767
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..2f2c58f309e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-insecure.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
new file mode 100644
index 00000000000..bbfd46731fb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-insecure.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..3caae65af31
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-insecure.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..0416cf7b094
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5f9d1c53bf5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..9e3941228ad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..14844a36de1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-insecure.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b1a7142bb06
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-insecure.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..c430768f76c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[cross-insecure.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d5c1d27a567
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..367d99cbbc7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..07c127768c0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..0b09e8ee7a6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-insecure.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
new file mode 100644
index 00000000000..7e072afd924
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-insecure.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..01d51580ae9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[same-insecure.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..5987926e09a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2fc5069b2cd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..5d3e97c6fa9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..0e62fa598bf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..91abba71975
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..52fe13d934e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..5a89a25fcd7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..c128043e5bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..8884bc55767
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..4d4133d1810
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..379d1ca9519
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..35d5d1b279e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..0416cf7b094
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..5f9d1c53bf5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..9e3941228ad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..8e0ac34e08f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..dec31592ea0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..ffd86b9e51f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d5c1d27a567
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..367d99cbbc7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..07c127768c0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..3ff49d9e685
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.keep-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..862909bdb3c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..e29d97cefc5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[insecure-protocol.swap-origin-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..5987926e09a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 00000000000..2fc5069b2cd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..5d3e97c6fa9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[upgrade-protocol.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 fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..c898fa80241
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..8e5c95601e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d1490636461
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..d00e6e22ff6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..8d87280c79f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..deab0ea3e40
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..628f42bed07
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..b69578af3ec
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[generic.no-redirect.http.html]
+  type: testharness
+  expected: TIMEOUT
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..a4d8fc95ea0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 http\n                                 sub-resource via fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..2ba51da7d5d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
new file mode 100644
index 00000000000..063f2d051a6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.no-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 00000000000..16e673924b5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,6 @@
+[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 fetch-request 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/metadata/webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html.ini
index af1ab6b13cf..11c196c35b6 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/origin-clean-conformance.html.ini
@@ -1,4 +1,3 @@
 [origin-clean-conformance.html]
   type: testharness
   disabled: https://github.com/servo/servo/issues/13341
-